Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36e649f3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents b0b89759 b3449ea7
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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