Merge commit 'ee3993069ff55fa6f1c64daf1e09963e340db8e4' into upstream-merge
commit96db1a0255d1f20ad4953bd9eef9ca51bdd99982
authorMarcelo Tosatti <mtosatti@redhat.com>
Tue, 29 Sep 2009 12:40:29 +0000 (29 09:40 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 29 Sep 2009 12:40:29 +0000 (29 09:40 -0300)
treed4c8bc5a83b11f56bf04a4e7dbfd146f1ce762f7
parent8e53a621cc5708f8409e288161f15b49f239ab75
parentee3993069ff55fa6f1c64daf1e09963e340db8e4
Merge commit 'ee3993069ff55fa6f1c64daf1e09963e340db8e4' into upstream-merge

* commit 'ee3993069ff55fa6f1c64daf1e09963e340db8e4':
  posix-aio-compat: avoid signal race when spawning a thread
  target-i386: kill a tmp register
  target-i386: use subfi instead of sub with a non-freed constant
  eepro100: Fix format strings in debug messages
  eepro100: Replace sprintf by snprintf
  eepro100: Remove unused code
  eepro100: Enhanced logging and comments
  fix -daemonize with kvm
  Set SDL icon_title when using `-name XXX` for proper gnome-panel window list integration
  qemu-option: rename bool -> boolean
  ARM back-end: Use sxt[bh] instructions for ext{8, 6}s
  Fix and improve qint_from_int64_test
  monitor: Fix do_wav_capture() argument type

Conflicts:
vl.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
posix-aio-compat.c
qemu-monitor.hx