summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-11-03 08:39:19 -0600
committerBjorn Helgaas <bhelgaas@google.com>2015-11-03 08:39:19 -0600
commit4ed31f24a6416cc60bc8e92c25b2de3060fbedf8 (patch)
treef3ae3c8f4ad382bff930ff200861352a5a6b9838 /MAINTAINERS
parentc2df02bdaac28bedcee6b9921b7c2927dafac471 (diff)
parent500a1d9a43e0a16e3cfc48f4b192ad421d4de376 (diff)
downloadlinux-4ed31f24a6416cc60bc8e92c25b2de3060fbedf8.tar.bz2
Merge branch 'pci/host-hisi' into next
* pci/host-hisi: PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index eeb9ec999cda..556a8c0b8406 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8063,6 +8063,13 @@ S: Maintained
F: Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
F: drivers/pci/host/pci-xgene-msi.c
+PCIE DRIVER FOR HISILICON
+M: Zhou Wang <wangzhou1@hisilicon.com>
+L: linux-pci@vger.kernel.org
+S: Maintained
+F: Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
+F: drivers/pci/host/pcie-hisi.c
+
PCMCIA SUBSYSTEM
P: Linux PCMCIA Team
L: linux-pcmcia@lists.infradead.org