Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
commitd167dac993bc8223eb20b45e009bff22abd83354
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Nov 2012 14:30:45 +0000 (19 08:30 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Nov 2012 14:30:45 +0000 (19 08:30 -0600)
treefaf6f888b5b0e43ebcf5c52cbbd6244a00d58d0d
parente75fce6cda8cd515645e0bd16ed4ef6260d777c7
parent78021d6d8dc50ed4d67442c3ca11eab78220e9ef
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
  kvm: Actually remove software breakpoints from list on cleanup
  acpi_piix4: fix migration of gpe fields

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>