summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2019-01-02 15:31:15 -0600
committerBjorn Helgaas <bhelgaas@google.com>2019-01-02 15:31:15 -0600
commitcdf4f4dc118bafd97d0148d53730e396ece11afa (patch)
tree91f12d628f1ec43fee71da3269b8fe0ad7d4b4e8 /MAINTAINERS
parentc266b026ae7a51f876eb74e15ff63f834fe35976 (diff)
parent7e6d5cd88a6f4961ed2968799ef98528c13ac5f8 (diff)
downloadlinux-cdf4f4dc118bafd97d0148d53730e396ece11afa.tar.bz2
Merge branch 'remotes/lorenzo/pci/uniphier'
- Add UniPhier PCIe controller driver and DT bindings (Kunihiko Hayashi) * remotes/lorenzo/pci/uniphier: PCI: uniphier: Add UniPhier PCIe host controller support dt-bindings: PCI: Add UniPhier PCIe host controller description # Conflicts: # drivers/pci/controller/dwc/Kconfig # drivers/pci/controller/dwc/Makefile
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4cdf07c51ef8..68c5be2633b2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11585,6 +11585,13 @@ S: Maintained
F: Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
F: drivers/pci/controller/pci-v3-semi.c
+PCIE DRIVER FOR SOCIONEXT UNIPHIER
+M: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+L: linux-pci@vger.kernel.org
+S: Maintained
+F: Documentation/devicetree/bindings/pci/uniphier-pcie.txt
+F: drivers/pci/controller/dwc/pcie-uniphier.c
+
PCIE DRIVER FOR ST SPEAR13XX
M: Pratyush Anand <pratyush.anand@gmail.com>
L: linux-pci@vger.kernel.org