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

diff --cc arch/alpha/kernel/sys_ruffian.c
Simple merge

diff --cc arch/arm/common/it8152.c
Simple merge

diff --cc arch/arm/mach-cns3xxx/pcie.c
Simple merge

diff --cc arch/arm/mach-dove/pcie.c
Simple merge

diff --cc arch/arm/mach-iop13xx/pci.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/goramo_mlr.c
Simple merge

diff --cc arch/arm/mach-kirkwood/pcie.c
Simple merge

diff --cc arch/arm/mach-mv78xx0/pcie.c
Simple merge

diff --cc arch/arm/mach-orion5x/pci.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x2xx-pci.c
Simple merge

diff --cc arch/arm/mach-sa1100/pci-nanoengine.c
Simple merge

diff --cc arch/arm/mach-shark/pci.c
Simple merge

diff --cc arch/arm/mach-tegra/pcie.c
Simple merge

diff --cc arch/arm/mach-versatile/pci.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc include/linux/pci.h
Simple merge