summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-14 20:09:46 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-14 20:09:46 +0100
commitb12f3cbd7a9a869eae1eb108da02526b132ba80b (patch)
treeffa66c2c788af7a0b9c23e0c3a28e2ab81e5b7f4 /MAINTAINERS
parent74b8721099992b76d3faff78cb8a5d13c65c3529 (diff)
parent57475b1a47b3e891ce087ca3c6fc93f5a446a244 (diff)
downloadlinux-b12f3cbd7a9a869eae1eb108da02526b132ba80b.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS12
1 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5a2387d13339..a67112feba18 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -781,11 +781,10 @@ M: Philipp Zabel <philipp.zabel@gmail.com>
S: Maintained
ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
-M: Lennert Buytenhek <buytenh@marvell.com>
-M: Nicolas Pitre <nico@marvell.com>
+M: Lennert Buytenhek <kernel@wantstofly.org>
+M: Nicolas Pitre <nico@fluxnic.net>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-T: git git://git.marvell.com/orion
-S: Maintained
+S: Odd Fixes
F: arch/arm/mach-loki/
F: arch/arm/mach-kirkwood/
F: arch/arm/mach-mv78xx0/
@@ -3644,7 +3643,8 @@ F: drivers/net/wireless/mwl8k.c
MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
M: Nicolas Pitre <nico@fluxnic.net>
-S: Maintained
+S: Odd Fixes
+F: drivers/mmc/host/mvsdio.*
MARVELL YUKON / SYSKONNECT DRIVER
M: Mirko Lindner <mlindner@syskonnect.de>
@@ -5141,7 +5141,7 @@ F: mm/sl?b.c
SMC91x ETHERNET DRIVER
M: Nicolas Pitre <nico@fluxnic.net>
-S: Maintained
+S: Odd Fixes
F: drivers/net/smc91x.*
SMSC47B397 HARDWARE MONITOR DRIVER