aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS12
1 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d5b0b1b6dc52..d634cb098b76 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -775,11 +775,10 @@ M: Philipp Zabel <philipp.zabel@gmail.com>
775S: Maintained 775S: Maintained
776 776
777ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support 777ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
778M: Lennert Buytenhek <buytenh@marvell.com> 778M: Lennert Buytenhek <kernel@wantstofly.org>
779M: Nicolas Pitre <nico@marvell.com> 779M: Nicolas Pitre <nico@fluxnic.net>
780L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 780L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
781T: git git://git.marvell.com/orion 781S: Odd Fixes
782S: Maintained
783F: arch/arm/mach-loki/ 782F: arch/arm/mach-loki/
784F: arch/arm/mach-kirkwood/ 783F: arch/arm/mach-kirkwood/
785F: arch/arm/mach-mv78xx0/ 784F: arch/arm/mach-mv78xx0/
@@ -3624,7 +3623,8 @@ F: drivers/net/wireless/mwl8k.c
3624 3623
3625MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER 3624MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
3626M: Nicolas Pitre <nico@fluxnic.net> 3625M: Nicolas Pitre <nico@fluxnic.net>
3627S: Maintained 3626S: Odd Fixes
3627F: drivers/mmc/host/mvsdio.*
3628 3628
3629MARVELL YUKON / SYSKONNECT DRIVER 3629MARVELL YUKON / SYSKONNECT DRIVER
3630M: Mirko Lindner <mlindner@syskonnect.de> 3630M: Mirko Lindner <mlindner@syskonnect.de>
@@ -5121,7 +5121,7 @@ F: mm/sl?b.c
5121 5121
5122SMC91x ETHERNET DRIVER 5122SMC91x ETHERNET DRIVER
5123M: Nicolas Pitre <nico@fluxnic.net> 5123M: Nicolas Pitre <nico@fluxnic.net>
5124S: Maintained 5124S: Odd Fixes
5125F: drivers/net/smc91x.* 5125F: drivers/net/smc91x.*
5126 5126
5127SMSC47B397 HARDWARE MONITOR DRIVER 5127SMSC47B397 HARDWARE MONITOR DRIVER