summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-02-26 14:00:51 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-02-26 14:00:51 -0700
commit2c0503f202f597325baae76e9f5686518e5ed0dd (patch)
tree369e429d82647b9c3bdeda4513fe15e578c6a987 /drivers/pci
parent02a0947ae458837424c8c77f1922c54678283df7 (diff)
parentdbffdd6862e67d60703f2df66c558bf448f81d6e (diff)
parentf95d3ae771916c8c7024fecfb6c420e5dfeced05 (diff)
parentef4741e90c4e6523795f4375659b5097293d87db (diff)
Merge branches 'pci/host-designware', 'pci/host-imx6' and 'pci/host-rcar' into next
* pci/host-designware: PCI: designware: Fix RC BAR to be single 64-bit non-prefetchable memory BAR * pci/host-imx6: PCI: imx6: Wait for retraining * pci/host-rcar: PCI: rcar: Make the Kconfig dependencies more generic PCI: rcar: Break out window size handling PCI: rcar: Register each instance independently PCI: rcar: Fix bridge logic configuration accesses PCI: rcar: Add error interrupt handling PCI: rcar: Check platform_get_irq() return code