Merge branch 'pci/host-kirin' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 4 Jul 2017 16:00:56 +0000 (11:00 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 4 Jul 2017 16:00:56 +0000 (11:00 -0500)
commit8a08e7eada357e853ff448482208a5ee7b94201a
treee097e7d1a228b82aec380f5de52d985019210922
parentbeaba77cf23f1734fc06ea90932526567c95ac25
parentfc5165db245ac4b56c19e634592a144352817c6d
Merge branch 'pci/host-kirin' into next

* pci/host-kirin:
  PCI: kirin: Add HiSilicon Kirin SoC PCIe controller driver
drivers/pci/dwc/Kconfig