Merge with /shiny/git/linux-2.6/.git

author: David Woodhouse <dwmw2@shinybook.infradead.org> 2005-08-09 11:51:35 -0400
committer: David Woodhouse <dwmw2@shinybook.infradead.org> 2005-08-09 11:51:35 -0400
commit: c973b112c76c9d8fd042991128f218a738cc8d0a (patch)
tree: e813b0da5d0a0e19e06de6462d145a29ad683026 /CREDITS
parent: c5fbc3966f48279dbebfde10248c977014aa9988 (diff)
parent: 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff)
1 files changed, 5 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index 3b7a1548aaf9..50121d432b62 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1624,10 +1624,10 @@ E: ajoshi@shell.unixbox.com
 D: fbdev hacking
 N: Jesper Juhl
-E: juhl-lkml@dif.dk
+E: jesper.juhl@gmail.com
-D: Various small janitor fixes, cleanups etc.
+D: Various fixes, cleanups and minor features.
 S: Lemnosvej 1, 3.tv
-S: 2300 Copenhagen S
+S: 2300 Copenhagen S.
 S: Denmark
 N: Jozsef Kadlecsik
@@ -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
author	David Woodhouse <dwmw2@shinybook.infradead.org>	2005-08-09 11:51:35 -0400
committer	David Woodhouse <dwmw2@shinybook.infradead.org>	2005-08-09 11:51:35 -0400
commit	c973b112c76c9d8fd042991128f218a738cc8d0a (patch)
tree	e813b0da5d0a0e19e06de6462d145a29ad683026 /CREDITS
parent	c5fbc3966f48279dbebfde10248c977014aa9988 (diff)
parent	00dd1e433967872f3997a45d5adf35056fdf2f56 (diff)

diff --git a/CREDITS b/CREDITS index 3b7a1548aaf9..50121d432b62 100644 --- a/CREDITS +++ b/CREDITS
@@ -1624,10 +1624,10 @@ E: ajoshi@shell.unixbox.com
1624	D: fbdev hacking	1624	D: fbdev hacking
1625		1625
1626	N: Jesper Juhl	1626	N: Jesper Juhl
1627	E: juhl-lkml@dif.dk	1627	E: jesper.juhl@gmail.com
1628	D: Various small janitor fixes, cleanups etc.	1628	D: Various fixes, cleanups and minor features.
1629	S: Lemnosvej 1, 3.tv	1629	S: Lemnosvej 1, 3.tv
1630	S: 2300 Copenhagen S	1630	S: 2300 Copenhagen S.
1631	S: Denmark	1631	S: Denmark
1632		1632
1633	N: Jozsef Kadlecsik	1633	N: Jozsef Kadlecsik
@@ -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