diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-06 09:59:15 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-06 09:59:15 -0600 |
| commit | f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1 (patch) | |
| tree | c747c9ce1882b9a08d284603717890c5ef81bbf7 /MAINTAINERS | |
| parent | 55dd4175a4bc10d943c159dabef552baaf459a59 (diff) | |
| parent | 767ebaff4ef7235eb49ddec5d48db97b17c37cf5 (diff) | |
Merge branch 'pci/host-xgene' into next
* pci/host-xgene:
arm64: dts: Add APM X-Gene PCIe device tree nodes
PCI: xgene: Add APM X-Gene PCIe driver
Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/Makefile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 07fd7e279700..fac7057ba67c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6868,6 +6868,14 @@ F: include/linux/pci* F: arch/x86/pci/ F: arch/x86/kernel/quirks.c +PCI DRIVER FOR APPLIEDMICRO XGENE +M: Tanmay Inamdar <tinamdar@apm.com> +L: linux-pci@vger.kernel.org +L: linux-arm-kernel@lists.infradead.org +S: Maintained +F: Documentation/devicetree/bindings/pci/xgene-pci.txt +F: drivers/pci/host/pci-xgene.c + PCI DRIVER FOR IMX6 M: Richard Zhu <r65037@freescale.com> M: Lucas Stach <l.stach@pengutronix.de> |