aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <[email protected]>2013-11-12 15:08:56 -0800
committerLinus Torvalds <[email protected]>2013-11-13 12:09:14 +0900
commitb300645aec9a5d71f6d85d5138215a9d6d7fe5e6 (patch)
tree724657ac8240c8edad580e12320203ef311aa8e3
parent07eb6597c059d9276c8dc7cd0401083ed66ad714 (diff)
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 <[email protected]> Cc: Russell King <[email protected]> Cc: Zwane Mwaikambo <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-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
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 <[email protected]>
Srivatsa Vaddagiri <[email protected]>
i386:
- Zwane Mwaikambo <[email protected]>
+ Zwane Mwaikambo <[email protected]>
ppc64:
Nathan Lynch <[email protected]>
Joel Schopp <[email protected]>
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 <[email protected]>
+M: Zwane Mwaikambo <[email protected]>
S: Maintained
F: drivers/watchdog/sc1200wdt.c