X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=CREDITS;h=f553f8cfaa6266a54bc4081d448719d73abb5001;hb=b1dd9ca177bd2ff5260376dd024dd43eb4631dc7;hp=d97e62524ddcc46ae7e15a3577cf745a03844445;hpb=661299d9d0437a0ff72240f3d60016ac3a361a6e;p=linux-2.6-omap-h63xx.git

diff --git a/CREDITS b/CREDITS
index d97e62524dd..f553f8cfaa6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com
 D: bug fixes, documentation, minor hackery
 
 N: James Morris
-E: jmorris@redhat.com
-W: http://www.intercode.com.au/jmorris/
+E: jmorris@namei.org
+W: http://namei.org/
 D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
 D: Crypto API, general networking, miscellaneous.
 S: PO Box 707
@@ -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