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

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

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

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

diff --cc arch/arm/mach-mv78xx0/pcie.c
index 12fcb108b0e13036c7de59583e3af5f7e1d99007,c701135f139e876d92ac3fcb85e232bdedf0124c..8459f6d7d8caff6091fe05d2862895ba94460626
--- 1/arch/arm/mach-mv78xx0/pcie.c
--- 2/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@@ -153,11 -153,10 +153,10 @@@ static int __init mv78xx0_pcie_setup(in
         * Generic PCIe unit setup.
         */
        orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
 -      orion_pcie_setup(pp->base, &mv78xx0_mbus_dram_info);
 +      orion_pcie_setup(pp->base);
  
-       sys->resource[0] = &pp->res[0];
-       sys->resource[1] = &pp->res[1];
-       sys->resource[2] = NULL;
+       pci_add_resource(&sys->resources, &pp->res[0]);
+       pci_add_resource(&sys->resources, &pp->res[1]);
  
        return 1;
  }

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

diff --cc arch/arm/mach-tegra/pcie.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

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