sparc64: merge fix

[karo-tx-linux.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index dc04d8f80a89b48090f34ac9ed878c3652081516..4fc997d58ab2640a4b94fdcb1f363935f8a13395 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -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