Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index a4e5599..6bd8ab8 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -2678,7 +2678,7 @@ S: Ottawa, Ontario
 S: Canada K2P 0X8
 
 N: Mikael Pettersson
-E: mikpe@csd.uu.se
+E: mikpe@it.uu.se
 W: http://www.csd.uu.se/~mikpe/
 D: Miscellaneous fixes