From 3c7bf1eaee1255315fc7c2c4c300295e556ef768 Mon Sep 17 00:00:00 2001 From: Zwane Mwaikambo Date: Thu, 18 Aug 2005 11:24:07 -0700 Subject: [PATCH] [PATCH] Update email addresses for Zwane Some folks have been emailing me and having trouble due to these stale addresses; Signed-off-by: Zwane Mwaikambo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- CREDITS | 3 +-- MAINTAINERS | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CREDITS b/CREDITS index 50121d432b6..f553f8cfaa6 100644 --- a/CREDITS +++ b/CREDITS @@ -2423,8 +2423,7 @@ S: Toronto, Ontario S: Canada N: Zwane Mwaikambo -E: zwane@linuxpower.ca -W: http://function.linuxpower.ca +E: zwane@arm.linux.org.uk D: Various driver hacking D: Lowlevel x86 kernel hacking D: General debugging diff --git a/MAINTAINERS b/MAINTAINERS index 33122b1519c..564a03e61a0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1739,7 +1739,7 @@ S: Maintained OPL3-SA2, SA3, and SAx DRIVER P: Zwane Mwaikambo -M: zwane@commfireservices.com +M: zwane@arm.linux.org.uk L: linux-sound@vger.kernel.org S: Maintained @@ -1995,7 +1995,7 @@ S: Maintained SC1200 WDT DRIVER P: Zwane Mwaikambo -M: zwane@commfireservices.com +M: zwane@arm.linux.org.uk S: Maintained SCHEDULER -- 2.20.1