diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-04 12:00:57 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-04 12:00:57 -0400 |
commit | 097d05704e5952307b86ffef310a2a1e04f814b2 (patch) | |
tree | a683f923dcf984f89ccd13d29b500c68f9763ba9 /MAINTAINERS | |
parent | 8a08e7eada357e853ff448482208a5ee7b94201a (diff) | |
parent | ea7f4491e9773fbd1f57a3f38b9b9cd92090ba9b (diff) |
Merge branch 'pci/host-mediatek' into next
* pci/host-mediatek:
dt-bindings: PCI: Add documentation for MediaTek PCIe
PCI: mediatek: Add MediaTek PCIe host controller support
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3a9f9d3db437..ed26c0b2eeb5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -9965,6 +9965,14 @@ S: Supported | |||
9965 | F: Documentation/devicetree/bindings/pci/pci-thunder-* | 9965 | F: Documentation/devicetree/bindings/pci/pci-thunder-* |
9966 | F: drivers/pci/host/pci-thunder-* | 9966 | F: drivers/pci/host/pci-thunder-* |
9967 | 9967 | ||
9968 | PCIE DRIVER FOR MEDIATEK | ||
9969 | M: Ryder Lee <ryder.lee@mediatek.com> | ||
9970 | L: linux-pci@vger.kernel.org | ||
9971 | L: linux-mediatek@lists.infradead.org | ||
9972 | S: Supported | ||
9973 | F: Documentation/devicetree/bindings/pci/mediatek* | ||
9974 | F: drivers/pci/host/*mediatek* | ||
9975 | |||
9968 | PCMCIA SUBSYSTEM | 9976 | PCMCIA SUBSYSTEM |
9969 | P: Linux PCMCIA Team | 9977 | P: Linux PCMCIA Team |
9970 | L: linux-pcmcia@lists.infradead.org | 9978 | L: linux-pcmcia@lists.infradead.org |