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