Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Mar 2012 18:37:41 +0000 (13:37 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Mar 2012 18:37:41 +0000 (13:37 -0500)
* stefanha/trivial-patches:
  qemu-ga: for w32, fix leaked handle ov.hEvent in ga_channel_write()
  ioapic: fix build with DEBUG_IOAPIC
  .gitignore: add qemu-bridge-helper and option rom build products
  cleanup obsolete typedef
  monitor: Remove unused bool field 'qapi' in mon_cmd_t struct
  ds1338: Add missing break statement
  vnc: Fix packed boolean struct members
  Remove type field in ModuleEntry as it's not used

1  2 
monitor.c

diff --cc monitor.c
Simple merge