diff options
| -rw-r--r-- | CREDITS | 2 | ||||
| -rw-r--r-- | Documentation/cpu-hotplug.txt | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 |