Merge remote-tracking branch 'pci/linux-next'

diff --cc arch/arm/mach-ixp2000/enp2611.c
Simple merge

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

diff --cc arch/powerpc/include/asm/pci-bridge.h
Simple merge

diff --cc arch/powerpc/include/asm/pci.h
Simple merge

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

diff --cc arch/tile/kernel/pci.c
Simple merge