Merge branch 'pci' into for_anthony

diff --cc Makefile.objs
Simple merge

diff --cc hw/acpi_piix4.c
Simple merge

diff --cc hw/eepro100.c
Simple merge

diff --cc hw/msix.c
Simple merge

diff --cc hw/pci.c
Simple merge

diff --cc hw/pci.h
Simple merge

diff --cc qemu-common.h
Simple merge