Merge remote-tracking branch 'origin/master' into pci
commitbefeac45d4d9afb587eca9a27d975db4a7950960
authorMichael S. Tsirkin <mst@redhat.com>
Tue, 14 Jun 2011 14:51:11 +0000 (14 17:51 +0300)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 15 Jun 2011 15:27:15 +0000 (15 18:27 +0300)
treeaab24c856a3ea944e287d7f2591bb4bab6a56eb4
parent35f754620615138aaae0ef72602f84c88fd8de0f
parent0b862cedf36d927818c50584ddd611b0370673df
Merge remote-tracking branch 'origin/master' into pci

Conflicts:
hw/virtio-pci.c
21 files changed:
exec.c
hw/9pfs/virtio-9p-device.c
hw/ac97.c
hw/acpi_piix4.c
hw/eepro100.c
hw/ide/ich.c
hw/lsi53c895a.c
hw/msi.c
hw/msix.c
hw/pc_piix.c
hw/pci.c
hw/pci.h
hw/pci_regs.h
hw/pcie_aer.c
hw/piix_pci.c
hw/qxl.c
hw/rtl8139.c
hw/usb-ohci.c
hw/usb-uhci.c
hw/virtio-pci.c
hw/virtio-pci.h