summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-11-15 15:26:12 +0100
committerBjorn Helgaas <bhelgaas@google.com>2014-11-15 15:26:12 +0100
commit35437e3d9b4171ffaf6867f5d8685159173df6ee (patch)
treea88487249ffb5b665c56f2c50b664c60874fbcc0 /drivers/pci/pci.c
parentLinux 3.18-rc1 (diff)
parentPCI: designware: Add a blank line after declarations (diff)
parentPCI: dra7xx: Add __init annotation to dra7xx_add_pcie_port() (diff)
parentPCI: exynos: Remove unnecessary return statement (diff)
parentPCI: generic: Convert to DT resource parsing API (diff)
parentPCI: imx6: Use tabs for indentation (diff)
parentPCI: keystone: Remove unnecessary OOM message (diff)
parentPCI: layerscape: Add Freescale Layerscape PCIe driver (diff)
parentPCI: mvebu: Add a blank line after declarations (diff)
parentPCI: rcar: Make rcar_pci static (diff)
parentPCI: spear: Remove unnecessary OOM message (diff)
parentPCI: tegra: Add Kconfig help text (diff)
downloadlinux-35437e3d9b4171ffaf6867f5d8685159173df6ee.tar.xz
linux-35437e3d9b4171ffaf6867f5d8685159173df6ee.zip
Merge branches 'pci/host-designware', 'pci/host-dra7xx', 'pci/host-exynos', 'pci/host-generic', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-mvebu', 'pci/host-rcar', 'pci/host-spear' and 'pci/host-tegra' into next
* pci/host-designware: PCI: designware: Add a blank line after declarations * pci/host-dra7xx: PCI: dra7xx: Add __init annotation to dra7xx_add_pcie_port() PCI: dra7xx: Rename add_pcie_port() to dra7xx_add_pcie_port() * pci/host-exynos: PCI: exynos: Remove unnecessary return statement PCI: exynos: Add exynos prefix to add_pcie_port()/pcie_init() * pci/host-generic: PCI: generic: Convert to DT resource parsing API PCI: generic: Allocate config space windows after limiting bus number range * pci/host-imx6: PCI: imx6: Use tabs for indentation * pci/host-keystone: PCI: keystone: Remove unnecessary OOM message PCI: keystone: Make ks_dw_pcie_msi_domain_ops static * pci/host-layerscape: PCI: layerscape: Add Freescale Layerscape PCIe driver * pci/host-mvebu: PCI: mvebu: Add a blank line after declarations * pci/host-rcar: PCI: rcar: Make rcar_pci static * pci/host-spear: PCI: spear: Remove unnecessary OOM message PCI: spear: Add __init annotation to spear13xx_add_pcie_port() PCI: spear: Rename add_pcie_port(), pcie_init() to spear13xx_add_pcie_port(), etc. * pci/host-tegra: PCI: tegra: Add Kconfig help text PCI: tegra: Do not build on 64-bit ARM