aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-12-12 12:25:08 -0500
committerBjorn Helgaas <bhelgaas@google.com>2016-12-12 12:25:08 -0500
commit36e649f3bb8859c4b498b27a4d1a01df6964e1bd (patch)
treed97318e93bef3c757005f92944c87fbc3ca5c573
parentb0b89759061a114f107c79bff63b37c445209a2d (diff)
parentb3449ea7fbd1e90a12dcf2ca16243b59a234b2fc (diff)
Merge branch 'pci/host-imx6' into next
* pci/host-imx6: MAINTAINERS: Add devicetree binding to PCI i.MX6 entry MAINTAINERS: Update Richard Zhu's email address
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1cd38a7e0064..5b608ac85641 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9230,11 +9230,12 @@ S: Maintained
9230F: drivers/pci/host/*layerscape* 9230F: drivers/pci/host/*layerscape*
9231 9231
9232PCI DRIVER FOR IMX6 9232PCI DRIVER FOR IMX6
9233M: Richard Zhu <Richard.Zhu@freescale.com> 9233M: Richard Zhu <hongxing.zhu@nxp.com>
9234M: Lucas Stach <l.stach@pengutronix.de> 9234M: Lucas Stach <l.stach@pengutronix.de>
9235L: linux-pci@vger.kernel.org 9235L: linux-pci@vger.kernel.org
9236L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 9236L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
9237S: Maintained 9237S: Maintained
9238F: Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
9238F: drivers/pci/host/*imx6* 9239F: drivers/pci/host/*imx6*
9239 9240
9240PCI DRIVER FOR TI KEYSTONE 9241PCI DRIVER FOR TI KEYSTONE