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 <jdelv...@suse.de> Cc: Russell King <rmk+ker...@arm.linux.org.uk> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Zwane Mwaikambo <zwa...@gmail.com> --- CREDITS | 2 +- Documentation/cpu-hotplug.txt | 2 +- MAINTAINERS | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- linux-3.12-rc6.orig/CREDITS 2013-09-30 08:47:53.797076563 +0200 +++ linux-3.12-rc6/CREDITS 2013-10-23 11:02:04.531400675 +0200 @@ -2576,7 +2576,7 @@ S: Toronto, Ontario S: Canada N: Zwane Mwaikambo -E: zw...@arm.linux.org.uk +E: zwa...@gmail.com D: Various driver hacking D: Lowlevel x86 kernel hacking D: General debugging --- linux-3.12-rc6.orig/Documentation/cpu-hotplug.txt 2013-09-24 00:41:09.000000000 +0200 +++ linux-3.12-rc6/Documentation/cpu-hotplug.txt 2013-10-23 11:02:09.641511953 +0200 @@ -5,7 +5,7 @@ Rusty Russell <ru...@rustcorp.com.au> Srivatsa Vaddagiri <va...@in.ibm.com> i386: - Zwane Mwaikambo <zw...@arm.linux.org.uk> + Zwane Mwaikambo <zwa...@gmail.com> ppc64: Nathan Lynch <nath...@austin.ibm.com> Joel Schopp <jsch...@austin.ibm.com> --- linux-3.12-rc6.orig/MAINTAINERS 2013-10-21 11:25:38.518242528 +0200 +++ linux-3.12-rc6/MAINTAINERS 2013-10-23 11:02:16.339657845 +0200 @@ -7276,7 +7276,7 @@ S: Odd Fixes F: drivers/media/usb/tlg2300/ SC1200 WDT DRIVER -M: Zwane Mwaikambo <zw...@arm.linux.org.uk> +M: Zwane Mwaikambo <zwa...@gmail.com> S: Maintained F: drivers/watchdog/sc1200wdt.c -- Jean Delvare Suse L3 Support -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/