summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-11-15 07:26:12 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-11-15 07:26:12 -0700
commit35437e3d9b4171ffaf6867f5d8685159173df6ee (patch)
treea88487249ffb5b665c56f2c50b664c60874fbcc0
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
parent2c992f3779e699a0f03dbfa39fcd96efee422bbe (diff)
parente73044a069c40b8c49c75f1869a07bd912801494 (diff)
parentbc512c5a8c78db6904de7275bce54ce5b1433893 (diff)
parentdbf9826d57974c2b4e68928528a4a6c354ceddb3 (diff)
parentd88a7ef99e4c15985e0d726d4a4e4c1f0e4f0ad5 (diff)
parent6670070742991c69e02dde38c611a6c31ce8f30b (diff)
parent62d0ff83c6e2221662fa0dccf2de096bdc7a2fc4 (diff)
parentcf3a9d6bae51e3ff14196a4684c47c234fc34c27 (diff)
parent3c70637f7569de3ebf05e2961c05e05ed80e22df (diff)
parent20f9ece101d8793331f61a234cef3ee000891085 (diff)
parent6b1c4d7674edd213295befb9e007edd6aea857ff (diff)
downloadblackbird-op-linux-35437e3d9b4171ffaf6867f5d8685159173df6ee.tar.gz
blackbird-op-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
OpenPOWER on IntegriCloud