]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Dec 2012 14:34:29 +0000 (08:34 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Dec 2012 14:34:29 +0000 (08:34 -0600)
commit7c12fd9b29c6ca2119396f143d84706f2fba6222
tree4aec8a23b6899c8ef34e716b2328f5d443663503
parent8385b173a0ca4c2345434104e6cc2a7259adc4b9
parent654598c944aa31cdbea435bd468055af9c918d16
Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error path
  qemu-options: Fix space at EOL
  Fix spelling in comments and documentation
  Clean up pci_drive_hot_add()'s use of BlockInterfaceType
  arm: a9mpcore: remove un-used ptimer_iomem field
  target-sparc: Remove t0, t1 from CPUSPARCState
  target-m68k: Remove t1 from CPUM68KState
  target-alpha: Remove t0, t1 from CPUAlphaState
  s390x: Spelling fixes (endianess -> endianness, occured -> occurred)
  Fix comments (adress -> address, layed -> laid, wierd -> weird)
  Fix spelling (prefered -> preferred)
  configure: Remove stray debug output
  sd: Send debug printfery to stderr not stdout

Conflicts:
configure

Resolve spelling conflict in configure.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
configure
hw/usb.h
tcg/tcg.h