summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-08-05 03:52:29 +0200
committerBjorn Helgaas <bhelgaas@google.com>2015-08-05 03:52:29 +0200
commitcd66d5c3df7c96cbf75010b964b94032ceca8889 (patch)
tree07e9cd5888d643d1b24b38886095988c06f05d19 /drivers/pci
parentLinux 4.2-rc2 (diff)
parentPCI: designware: Don't complain missing *config* reg space if va_cfg0 is set (diff)
parentPCI: xgene: Add support for a 64-bit prefetchable memory window (diff)
parentPCI: xilinx: Check for MSI interrupt flag before handling as INTx (diff)
downloadlinux-cd66d5c3df7c96cbf75010b964b94032ceca8889.tar.xz
linux-cd66d5c3df7c96cbf75010b964b94032ceca8889.zip
Merge branches 'pci/host-designware', 'pci/host-xgene' and 'pci/host-xilinx' into next
* pci/host-designware: PCI: designware: Don't complain missing *config* reg space if va_cfg0 is set * pci/host-xgene: PCI: xgene: Add support for a 64-bit prefetchable memory window arm64: dts: Add APM X-Gene PCIe 64-bit prefetchable window PCI: xgene: Drop owner assignment from platform_driver * pci/host-xilinx: PCI: xilinx: Check for MSI interrupt flag before handling as INTx