diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 10:47:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 10:47:16 +1000 |
| commit | d316af38d86f29df72bc765015714913cd232f53 (patch) | |
| tree | 1c3d8cafe40e8c61bd4e65d6407008f71b7ac111 /MAINTAINERS | |
| parent | 2ebf3d92c63e165fec8a26b98b1aab21689f18c2 (diff) | |
| parent | e0e47b176985a80e94b01b1b0dd1287397151ac5 (diff) | |
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-shmobile/headsmp.S
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 61a8f486306b..ac77ff93c08f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1096,14 +1096,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-berlin/ -ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support +ARM/Marvell Dove/MV78xx0/Orion SOC support M: Jason Cooper <jason@lakedaemon.net> M: Andrew Lunn <andrew@lunn.ch> M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-dove/ -F: arch/arm/mach-kirkwood/ F: arch/arm/mach-mv78xx0/ F: arch/arm/mach-orion5x/ F: arch/arm/plat-orion/ @@ -6851,6 +6850,12 @@ S: Maintained F: Documentation/devicetree/bindings/pci/host-generic-pci.txt F: drivers/pci/host/pci-host-generic.c +PCIE DRIVER FOR ST SPEAR13XX +M: Mohit Kumar <mohit.kumar@st.com> +L: linux-pci@vger.kernel.org +S: Maintained +F: drivers/pci/host/*spear* + PCMCIA SUBSYSTEM P: Linux PCMCIA Team L: linux-pcmcia@lists.infradead.org |