1 files changed, 3 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index d97e62524ddc..f553f8cfaa62 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
+E: jmorris@namei.org
-W: http://www.intercode.com.au/jmorris/
+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
+E: zwane@arm.linux.org.uk
-W: http://function.linuxpower.ca
 D: Various driver hacking
 D: Lowlevel x86 kernel hacking
 D: General debugging

diff --git a/CREDITS b/CREDITS index d97e62524ddc..f553f8cfaa62 100644 --- a/CREDITS +++ b/CREDITS
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com
2380	D: bug fixes, documentation, minor hackery	2380	D: bug fixes, documentation, minor hackery
2381		2381
2382	N: James Morris	2382	N: James Morris
2383	E: jmorris@redhat.com	2383	E: jmorris@namei.org
2384	W: http://www.intercode.com.au/jmorris/	2384	W: http://namei.org/
2385	D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,	2385	D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
2386	D: Crypto API, general networking, miscellaneous.	2386	D: Crypto API, general networking, miscellaneous.
2387	S: PO Box 707	2387	S: PO Box 707
@@ -2423,8 +2423,7 @@ S: Toronto, Ontario
2423	S: Canada	2423	S: Canada
2424		2424
2425	N: Zwane Mwaikambo	2425	N: Zwane Mwaikambo
2426	E: zwane@linuxpower.ca	2426	E: zwane@arm.linux.org.uk
2427	W: http://function.linuxpower.ca
2428	D: Various driver hacking	2427	D: Various driver hacking
2429	D: Lowlevel x86 kernel hacking	2428	D: Lowlevel x86 kernel hacking
2430	D: General debugging	2429	D: General debugging