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>

diff --cc configure
index e5aedef78800c9cb09a6dc65a6ce40dc9e26681a,79605d2b7539e7488c62a1385e44a72a0c92d2e4..38b1cc6b3573dd8449d28a82614c694f5b44b722
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2138,8 -2129,8 +2138,8 @@@ if test "$pixman" = "system"; the
    pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null`
  else
    if test ! -d ${source_path}/pixman/pixman; then
 -    echo "ERROR: pixman not present. Your options:"
 +    echo "ERROR: pixman not present (or older than 0.18.4). Your options:"
-     echo "  (1) Prefered: Install the pixman devel package (any recent"
+     echo "  (1) Preferred: Install the pixman devel package (any recent"
      echo "      distro should have packages as Xorg needs pixman too)."
      echo "  (2) Fetch the pixman submodule, using:"
      echo "      git submodule update --init pixman"

diff --cc hw/usb.h
Simple merge

diff --cc tcg/tcg.h
Simple merge