Merge remote-tracking branch 'pci/next'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/cris/arch-v32/drivers/pci/bios.c
Simple merge

diff --cc arch/microblaze/pci/pci-common.c
Simple merge

diff --cc arch/mips/txx9/generic/pci.c
Simple merge

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

diff --cc arch/powerpc/kernel/pci_of_scan.c
Simple merge

diff --cc arch/x86/include/asm/pci_x86.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/parisc/iosapic.c
Simple merge

diff --cc drivers/pci/hotplug/ibmphp_core.c
Simple merge

diff --cc drivers/pci/pci-driver.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc drivers/pci/setup-bus.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge