summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-08-01 12:22:43 -0500
committerBjorn Helgaas <bhelgaas@google.com>2016-08-01 12:22:43 -0500
commit499e858e3113452e7fc3c75678e6ba2a52546dc5 (patch)
tree28ae04fb9ed1a2d5d3c2d80e584352d28a2265c6 /drivers/pci
parentaf8c34ce6ae32addda3788d54a7e340cad22516b (diff)
parent09e3cded27709d148ce06313f96b777ba7617f26 (diff)
parentd7d5677c5ac39af5956ac6c88ac59cea052fea78 (diff)
downloadlinux-499e858e3113452e7fc3c75678e6ba2a52546dc5.tar.bz2
Merge branches 'pci/host-artpec' and 'pci/host-generic' into pci/demodularize-hosts
* pci/host-artpec: PCI: artpec: Add PCI_MSI_IRQ_DOMAIN dependency PCI: artpec: Add Axis ARTPEC-6 PCIe controller driver PCI: Add DT binding for Axis ARTPEC-6 PCIe controller * pci/host-generic: PCI: generic: Select IRQ_DOMAIN