aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorJames Morris <jmorris@redhat.com>2005-06-22 12:55:42 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 10:40:39 -0700
commit94eb7f4cefaf3ed8e97504ce4f3946bdb908e501 (patch)
tree7d8e43d7170669de1dc1b0dffdd8e45ad1809b8f /CREDITS
parentb53542073927878b18d642f6bf794adef6d45a18 (diff)
downloadkernel_samsung_smdk4412-94eb7f4cefaf3ed8e97504ce4f3946bdb908e501.tar.gz
kernel_samsung_smdk4412-94eb7f4cefaf3ed8e97504ce4f3946bdb908e501.tar.bz2
kernel_samsung_smdk4412-94eb7f4cefaf3ed8e97504ce4f3946bdb908e501.zip
[PATCH] Update my credits entry
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS5
1 files changed, 3 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 2993348ce6c..3b7a1548aaf 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2380,9 +2380,10 @@ E: tmolina@cablespeed.com
D: bug fixes, documentation, minor hackery
N: James Morris
-E: jmorris@intercode.com.au
+E: jmorris@redhat.com
W: http://www.intercode.com.au/jmorris/
-D: Netfilter, Linux Security Modules (LSM).
+D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
+D: Crypto API, general networking, miscellaneous.
S: PO Box 707
S: Spit Junction NSW 2088
S: Australia