Merge remote-tracking branch 'pci/next'

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/mips/pci/pci.c
index 0e3f437e8cadbca654030e195b69d9677d8b497d,8bb13a4af68a097057f55d9379961a6f0319a4e4..b8a0bf5766f2efb64380ae3dedddca3b4782da03
--- 1/arch/mips/pci/pci.c
--- 2/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@@ -91,15 -91,9 +91,12 @@@ static void pcibios_scanbus(struct pci_
  
        pci_add_resource_offset(&resources,
                                hose->mem_resource, hose->mem_offset);
 -      pci_add_resource_offset(&resources, hose->io_resource, hose->io_offset);
 +      pci_add_resource_offset(&resources,
 +                              hose->io_resource, hose->io_offset);
 +      pci_add_resource_offset(&resources,
 +                              hose->busn_resource, hose->busn_offset);
        bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,
                                &resources);
-       if (!bus)
-               pci_free_resource_list(&resources);
- 
        hose->bus = bus;
  
        need_domain_info = need_domain_info || hose->index;

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

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

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

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