summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-05-29 00:16:27 +0200
committerBjorn Helgaas <bhelgaas@google.com>2014-05-29 00:16:27 +0200
commit79d458bf47431675c6b38ea95ecfc31abd502eee (patch)
tree221c2a55ab0a1e44863b13791ae0b889cc43e487 /arch
parentMerge branches 'dma-api', 'pci/virtualization', 'pci/msi', 'pci/misc' and 'pc... (diff)
parentPCI: exynos: Remove unnecessary OOM messages (diff)
parentPCI: rcar: Add gen2 device tree support (diff)
parentx86/PCI: Clean up and mark early_root_info_init() as deprecated (diff)
downloadlinux-79d458bf47431675c6b38ea95ecfc31abd502eee.tar.xz
linux-79d458bf47431675c6b38ea95ecfc31abd502eee.zip
Merge branches 'pci/host-exynos', 'pci/host-rcar' and 'pci/amd-numa' into next
* pci/host-exynos: PCI: exynos: Remove unnecessary OOM messages * pci/host-rcar: PCI: rcar: Add gen2 device tree support PCI: rcar: Add R-Car PCIe device tree bindings PCI: rcar: Add MSI support for PCIe PCI: rcar: Add Renesas R-Car PCIe driver PCI: rcar: Use new OF interrupt mapping when possible * pci/amd-numa: x86/PCI: Clean up and mark early_root_info_init() as deprecated x86/PCI: Work around AMD Fam15h BIOSes that fail to provide _PXM x86/PCI: Warn if we have to "guess" host bridge node information