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)
commit123477dd647abcde10de2818f5a1c915a815b08a
treeac0c20fcaef6e9d675132617e95ca457dc51459e
parentd015328fcd51dcccd6382496ce004e733c04ea9d
parentbe1e8c72144afe4c5251f81ed86febf356b14a97
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