[PATCH] x86: i8253/i8259A lock cleanup
[pandora-kernel.git] / CREDITS
diff --git a/CREDITS b/CREDITS
index 2993348..3b7a154 100644 (file)
--- 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