projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
CREDITS
diff --git
a/CREDITS
b/CREDITS
index
d97e625
..
f553f8c
100644
(file)
--- a/
CREDITS
+++ b/
CREDITS
@@
-2380,8
+2380,8
@@
E: tmolina@cablespeed.com
D: bug fixes, documentation, minor hackery
N: James Morris
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
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
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
D: Various driver hacking
D: Lowlevel x86 kernel hacking
D: General debugging