]> git.proxmox.com Git - mirror_qemu.git/commit
Merge branch 'pci' into for_anthony
authorMichael S. Tsirkin <mst@redhat.com>
Wed, 27 Oct 2010 17:07:10 +0000 (19:07 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 27 Oct 2010 17:07:10 +0000 (19:07 +0200)
commitb907b69dd75415bc28349d1dd1e9a598ddace463
treeac0c20fcaef6e9d675132617e95ca457dc51459e
parentdf2943ba3c73ca21dbda063f15fa3e80064af864
parent804b207170cdccca3672b63caaf82312ad205a7f
Merge branch 'pci' into for_anthony
Makefile.objs
hw/acpi_piix4.c
hw/eepro100.c
hw/msix.c
hw/pci.c
hw/pci.h
qemu-common.h