MAINTAINERS: update Zwane Mwaikambo's e-mail address

Zwane Mwaikambo's @arm.linux.org.uk address no longer works.  In February
2013 he asked for his gmail address to be used instead [1] so let's just
do that.

[1] http://marc.info/?l=linux-kernel&m=136079068903214&w=2

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Zwane Mwaikambo <zwanem@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/CREDITS b/CREDITS
index dc04d8f80a89b48090f34ac9ed878c3652081516..4fc997d58ab2640a4b94fdcb1f363935f8a13395 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -2576,7 +2576,7 @@ S: Toronto, Ontario
 S: Canada
 
 N: Zwane Mwaikambo
-E: zwane@arm.linux.org.uk
+E: zwanem@gmail.com
 D: Various driver hacking
 D: Lowlevel x86 kernel hacking
 D: General debugging

diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index 786dc82f98ce4833c0ec8b1ecbcf8ad2a8f29ddf..8cb9938cc47e8c0e3d0202786bd9c434f96cbd4d 100644 (file)
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -5,7 +5,7 @@
                        Rusty Russell <rusty@rustcorp.com.au>
                        Srivatsa Vaddagiri <vatsa@in.ibm.com>
                i386:
-                       Zwane Mwaikambo <zwane@arm.linux.org.uk>
+                       Zwane Mwaikambo <zwanem@gmail.com>
                ppc64:
                        Nathan Lynch <nathanl@austin.ibm.com>
                        Joel Schopp <jschopp@austin.ibm.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 30c1e3913cb32a8b44370be205840661f66ef6c6..5cfa91b1974a22cafbda96e263c2a65d2a75b146 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7319,7 +7319,7 @@ S:        Odd Fixes
 F:     drivers/media/usb/tlg2300/
 
 SC1200 WDT DRIVER
-M:     Zwane Mwaikambo <zwane@arm.linux.org.uk>
+M:     Zwane Mwaikambo <zwanem@gmail.com>
 S:     Maintained
 F:     drivers/watchdog/sc1200wdt.c