diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 11:40:13 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 11:40:13 -0600 |
| commit | d785260e2f57d87de5c059de2dabc3cd31b745f0 (patch) | |
| tree | 3218775e396bde8b8139a8c3a01bb95cdc0822c2 /MAINTAINERS | |
| parent | fdaf36bd360fe1e74b34262ad705ef39d52c12de (diff) | |
| parent | cf28855ba7e03f2e2ce85166c117c7b6100dc710 (diff) | |
| download | linux-d785260e2f57d87de5c059de2dabc3cd31b745f0.tar.bz2 | |
Merge branch 'pci/host-generic' into next
* pci/host-generic:
MAINTAINERS: Add generic PCI host controller driver
PCI: generic: Add generic PCI host controller 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 8dbea21d973d..e97b50726b27 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6741,6 +6741,14 @@ L: linux-pci@vger.kernel.org S: Maintained F: drivers/pci/host/*designware* +PCI DRIVER FOR GENERIC OF HOSTS +M: Will Deacon <will.deacon@arm.com> +L: linux-pci@vger.kernel.org +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/pci/host-generic-pci.txt +F: drivers/pci/host/pci-host-generic.c + PCMCIA SUBSYSTEM P: Linux PCMCIA Team L: linux-pcmcia@lists.infradead.org |