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

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

* mst/tags/for_anthony:
  pci_bridge_dev: fix error path in pci_bridge_dev_initfn()
  qdev: release parent properties on dc->init failure
  msi: Use msi/msix_present more consistently
  msi: Invoke msi/msix_write_config from PCI core
  msi: Guard msi/msix_write_config with msi_present
  msi: Invoke msi/msix_reset from PCI core
  msi: Guard msi_reset with msi_present
  ahci: Clean up reset functions
  intel-hda: Fix reset of MSI function
  ahci: Fix reset of MSI function
  rtl8139: honor RxOverflow flag in can_receive method
  shpc: unparent device before free
---

df6606f4556a752d30a4eab26c626b6c34717ea8