Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
[linux-2.6.git] / CREDITS
diff --git a/CREDITS b/CREDITS
index 50121d4..f553f8c 100644 (file)
--- 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