X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=CREDITS;h=3b7a1548aaf9c945d6c9c46f2ef310b4f2de1807;hb=d41dee369bff3b9dcb6328d4d822926c28cc2594;hp=d65ffe5a4d0803c59159592b258f0dfc049ec8d3;hpb=a7df849c67f0a5248693e432d03f738e84d6826c;p=linux-2.6

diff --git a/CREDITS b/CREDITS
index d65ffe5a4d..3b7a1548aa 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1880,6 +1880,13 @@ S: Schlehenweg 9
 S: D-91080 Uttenreuth
 S: Germany
 
+N: Jaya Kumar
+E: jayalk@intworks.biz
+W: http://www.intworks.biz
+D: Arc monochrome LCD framebuffer driver, x86 reboot fixups
+S: Gurgaon, India
+S: Kuala Lumpur, Malaysia
+
 N: Gabor Kuti
 M: seasons@falcon.sch.bme.hu
 M: seasons@makosteszta.sote.hu
@@ -2373,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