summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-05-28 16:16:27 -0600
committerBjorn Helgaas <bhelgaas@google.com>2014-05-28 16:16:27 -0600
commit79d458bf47431675c6b38ea95ecfc31abd502eee (patch)
tree221c2a55ab0a1e44863b13791ae0b889cc43e487 /drivers/pci/pci.h
parente5558d1a516fa6924fa8d53152b665d4c26f142e (diff)
parent755ba5e406e5ddd876e85a881dc50c7f54a8fd6b (diff)
parentd47b62f4b1c0374517ccbdf3ee4a7cceead58905 (diff)
parent9e7f7231e451aa7a64edb9d1a84d6dd231019c5a (diff)
downloadlinux-79d458bf47431675c6b38ea95ecfc31abd502eee.tar.bz2
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