diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:08 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:08 -0600 |
| commit | 36e649f3bb8859c4b498b27a4d1a01df6964e1bd (patch) | |
| tree | d97318e93bef3c757005f92944c87fbc3ca5c573 | |
| parent | b0b89759061a114f107c79bff63b37c445209a2d (diff) | |
| parent | b3449ea7fbd1e90a12dcf2ca16243b59a234b2fc (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-- | MAINTAINERS | 3 |
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 F: drivers/pci/host/*layerscape* PCI DRIVER FOR IMX6 -M: Richard Zhu <Richard.Zhu@freescale.com> +M: Richard Zhu <hongxing.zhu@nxp.com> M: Lucas Stach <l.stach@pengutronix.de> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt F: drivers/pci/host/*imx6* PCI DRIVER FOR TI KEYSTONE |