From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 16 Apr 2012 17:52:22 +0000 (-0500)
Subject: Merge remote-tracking branch 'mst/tags/for_anthony' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=52346e8c75eba1ece4a782565d5a5ce2e23d5117;p=qemu.git

Merge remote-tracking branch 'mst/tags/for_anthony' into staging

* mst/tags/for_anthony:
  pci: fix corrupted pci conf index register by unaligned write
  acpi: explicitly account for >1 device per slot
  acpi_piix4: Re-define PCI hotplug eject register read
  acpi_piix4: Remove PCI_RMV_BASE write code
  acpi_piix4: Fix PCI hotplug race
  acpi_piix4: Disallow write to up/down PCI hotplug registers
  virtio-pci: change virtio balloon PCI class code
  ivshmem: add missing msix calls
  vhost: readd assert statement
  vhost: Fix size of dirty log sync on resize
  pc: reduce duplication in compat machine types
  piix_pci: fix typo in i400FX chipset init code
---

52346e8c75eba1ece4a782565d5a5ce2e23d5117