Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 01193a4fe30e339feff943c538349ad447f04aaf..9117b65f4ae374152242064d518a8f30a3a4fcb0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3324,7 +3324,7 @@ S:        Supported
 F:     drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
-M:     Nicolas Pitre <nico@cam.org>
+M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Maintained
 
 MARVELL YUKON / SYSKONNECT DRIVER
@@ -4696,7 +4696,7 @@ F:        include/linux/sl?b*.h
 F:     mm/sl?b.c
 
 SMC91x ETHERNET DRIVER
-M:     Nicolas Pitre <nico@cam.org>
+M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Maintained
 F:     drivers/net/smc91x.*