Merge branch 'pci/host-hisi' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 3 Nov 2015 14:39:19 +0000 (08:39 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 3 Nov 2015 14:39:19 +0000 (08:39 -0600)
commit4ed31f24a6416cc60bc8e92c25b2de3060fbedf8
treef3ae3c8f4ad382bff930ff200861352a5a6b9838
parentc2df02bdaac28bedcee6b9921b7c2927dafac471
parent500a1d9a43e0a16e3cfc48f4b192ad421d4de376
Merge branch 'pci/host-hisi' into next

* pci/host-hisi:
  PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver
MAINTAINERS
drivers/pci/host/Kconfig
drivers/pci/host/Makefile