From 72a7077c13a85d4ffa08734422afa3c6c224c5f2 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Mon, 3 May 2010 16:43:47 -0400 Subject: [PATCH] --- yaml --- r: 191908 b: refs/heads/master c: 18e2842b85a00158054b5751c4e5a1b56906895f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b3b022c6274c..20a3b7402b5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ccc8dab611fcd1d0961b73e22d6c2d108967862 +refs/heads/master: 18e2842b85a00158054b5751c4e5a1b56906895f diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d5b0b1b6dc52..d634cb098b76 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -775,11 +775,10 @@ M: Philipp Zabel S: Maintained ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support -M: Lennert Buytenhek -M: Nicolas Pitre +M: Lennert Buytenhek +M: Nicolas Pitre 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/ @@ -3624,7 +3623,8 @@ F: drivers/net/wireless/mwl8k.c MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER M: Nicolas Pitre -S: Maintained +S: Odd Fixes +F: drivers/mmc/host/mvsdio.* MARVELL YUKON / SYSKONNECT DRIVER M: Mirko Lindner @@ -5121,7 +5121,7 @@ F: mm/sl?b.c SMC91x ETHERNET DRIVER M: Nicolas Pitre -S: Maintained +S: Odd Fixes F: drivers/net/smc91x.* SMSC47B397 HARDWARE MONITOR DRIVER