summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci-driver.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-06-03 16:45:42 +0200
committerBjorn Helgaas <bhelgaas@google.com>2014-06-03 16:45:42 +0200
commit843a85ced99b9c8f8221f11d5cbcc56c2dae2842 (patch)
tree224bfaa52a57c35bab33c055735caa6e1a8a39b9 /drivers/pci/pci-driver.c
parentMerge branch 'pci/iommu' into next (diff)
parentPCI: designware: Remove unnecessary use of 'conf_lock' spinlock (diff)
parentPCI: designware: Split Exynos and i.MX bindings (diff)
parentPCI: mvebu: Use '%pa' for printing 'phys_addr_t' type (diff)
parentPCI: tegra: Use new OF interrupt mapping when possible (diff)
downloadlinux-843a85ced99b9c8f8221f11d5cbcc56c2dae2842.tar.xz
linux-843a85ced99b9c8f8221f11d5cbcc56c2dae2842.zip
Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-mvebu' and 'pci/host-tegra' into next
* pci/host-designware: PCI: designware: Remove unnecessary use of 'conf_lock' spinlock PCI: designware: Use new OF interrupt mapping when possible PCI: designware: Fix iATU programming for cfg1, io and mem viewport PCI: designware: Fix comment for setting number of lanes * pci/host-imx6: PCI: designware: Split Exynos and i.MX bindings * pci/host-mvebu: PCI: mvebu: Use '%pa' for printing 'phys_addr_t' type PCI: mvebu: Remove unnecessary use of 'conf_lock' spinlock PCI: mvebu: split PCIe BARs into multiple MBus windows when needed bus: mvebu-mbus: allow several windows with the same target/attribute bus: mvebu-mbus: Avoid setting an undefined window size PCI: mvebu: fix off-by-one in the computed size of the mbus windows * pci/host-tegra: PCI: tegra: Use new OF interrupt mapping when possible