Merge branch 'pci/host-xgene' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Nov 2017 18:11:37 +0000 (12:11 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Nov 2017 18:11:37 +0000 (12:11 -0600)
commit5164e38a1793ed47362da0c1dc5e2e38597252f8
tree11a43533be875dc4ac7fa69df44348f7d1b9cb09
parente9cd973f2bb28ef4f6ddd89c77708547af3bb183
parent92e31454f1ee0a078baf418d6f1cc20a7109a87f
Merge branch 'pci/host-xgene' into next

* pci/host-xgene:
  PCI: xgene: Rename xgene_pcie_probe_bridge() to xgene_pcie_probe()
drivers/pci/host/pci-xgene.c