aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2013-11-12 15:08:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 12:09:14 +0900
commitb300645aec9a5d71f6d85d5138215a9d6d7fe5e6 (patch)
tree724657ac8240c8edad580e12320203ef311aa8e3
parentMAINTAINERS: remove Richard Purdie as backlight maintainer (diff)
downloadlinux-dev-b300645aec9a5d71f6d85d5138215a9d6d7fe5e6.tar.xz
linux-dev-b300645aec9a5d71f6d85d5138215a9d6d7fe5e6.zip
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>
Diffstat (limited to '')
-rw-r--r--CREDITS2
-rw-r--r--Documentation/cpu-hotplug.txt2
-rw-r--r--MAINTAINERS2
3 files changed, 3 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index dc04d8f80a89..4fc997d58ab2 100644
--- 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 786dc82f98ce..8cb9938cc47e 100644
--- 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 30c1e3913cb3..5cfa91b1974a 100644
--- 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