aboutsummaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-06-26 18:21:37 +0200
committerAdrian Bunk <bunk@stusta.de>2006-06-26 18:21:37 +0200
commit0ecbf4b5fc38479ba29149455d56c11a23b131c0 (patch)
treed3431b2704d33f0bf7130e934c0f07c8bc794b47 /CREDITS
parentbdca3f202dbeaca2fcc4fb47219476286c999b0d (diff)
downloadlinux-2.6.34-ux500-0ecbf4b5fc38479ba29149455d56c11a23b131c0.tar.gz
move acknowledgment for Mark Adler to CREDITS
The place in the documentation of the Linux kernel to acknowledge contributions is the CREDITS file. Give Mark Adler an entry there instead of including a string in the kernel image. Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS5
1 files changed, 5 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 1d35f10ec3b..85c7c70b704 100644
--- a/CREDITS
+++ b/CREDITS
@@ -24,6 +24,11 @@ S: C. Negri 6, bl. D3
S: Iasi 6600
S: Romania
+N: Mark Adler
+E: madler@alumni.caltech.edu
+W: http://alumnus.caltech.edu/~madler/
+D: zlib decompression
+
N: Monalisa Agrawal
E: magrawal@nortelnetworks.com
D: Basic Interphase 5575 driver with UBR and ABR support.