Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[linux.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index 29be6d1fdf49abe2e4e7b1b442bbc198a4740dc0..6c06ded9882b39300e76f2cea4d57f78ff47f752 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -951,6 +951,12 @@ S: Brevia 1043
 S: S-114 79 Stockholm
 S: Sweden
 
+N: Pekka Enberg
+E: [email protected]
+W: http://www.cs.helsinki.fi/u/penberg/
+D: Various kernel hacks, fixes, and cleanups.
+S: Finland
+
 N: David Engebretsen
 E: [email protected]
 D: Linux port to 64-bit PowerPC architecture
@@ -1620,7 +1626,8 @@ D: fbdev hacking
 
 N: Jesper Juhl
 E: [email protected]
-D: Various fixes, cleanups and minor features.
+D: Various fixes, cleanups and minor features all over the tree.
+D: Wrote initial version of the hdaps driver (since passed on to others).
 S: Lemnosvej 1, 3.tv
 S: 2300 Copenhagen S.
 S: Denmark
@@ -2209,7 +2216,7 @@ S: (address available on request)
 S: USA
 
 N: Ian McDonald
-E: ia[email protected].nz
+E: ia[email protected].nz
 E: [email protected]
 W: http://wand.net.nz/~iam4
 W: http://imcdnzl.blogspot.com
@@ -2384,6 +2391,13 @@ N: Thomas Molina
 E: [email protected]
 D: bug fixes, documentation, minor hackery
 
+N: Paul Moore
+E: [email protected]
+D: NetLabel author
+S: Hewlett-Packard
+S: 110 Spit Brook Road
+S: Nashua, NH 03062
+
 N: James Morris
 E: [email protected]
 W: http://namei.org/
@@ -2470,7 +2484,8 @@ S: Derbyshire DE4 3RL
 S: United Kingdom
 
 N: Ian S. Nelson
-E: [email protected]
+E: [email protected]
+P: 1024D/00D3D983 3EFD 7B86 B888 D7E2 29B6  9E97 576F 1B97 00D3 D983
 D: Minor mmap and ide hacks
 S: 1370 Atlantis Ave.
 S: Lafayette CO, 80026