aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZwane Mwaikambo <zwane@arm.linux.org.uk>2005-08-18 11:24:07 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-18 12:53:56 -0700
commit3c7bf1eaee1255315fc7c2c4c300295e556ef768 (patch)
tree38e82882670dc2773740ebb081e8e1201c577c13
parent[PATCH] broken error path in drivers/pnp/card.c (diff)
downloadlinux-dev-3c7bf1eaee1255315fc7c2c4c300295e556ef768.tar.xz
linux-dev-3c7bf1eaee1255315fc7c2c4c300295e556ef768.zip
[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 <zwane@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--CREDITS3
-rw-r--r--MAINTAINERS4
2 files changed, 3 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 50121d432b62..f553f8cfaa62 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 33122b1519ca..564a03e61a0c 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