From fa791f5bdfa026a9abe1b48934943fd39f1e300b Mon Sep 17 00:00:00 2001 From: Niels Kristian Bech Jensen Date: Sun, 25 Jun 2006 05:48:47 -0700 Subject: [PATCH] Update contact information in CREDITS Update my contact information in CREDITS. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- CREDITS | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'CREDITS') diff --git a/CREDITS b/CREDITS index 9bf714a1c7d9..1d35f10ec3b2 100644 --- a/CREDITS +++ b/CREDITS @@ -1573,12 +1573,8 @@ S: 160 00 Praha 6 S: Czech Republic N: Niels Kristian Bech Jensen -E: nkbj@image.dk -W: http://www.image.dk/~nkbj +E: nkbj1970@hotmail.com D: Miscellaneous kernel updates and fixes. -S: Dr. Holsts Vej 34, lejl. 164 -S: DK-8230 Åbyhøj -S: Denmark N: Michael K. Johnson E: johnsonm@redhat.com -- cgit v1.2.3 From 0ecbf4b5fc38479ba29149455d56c11a23b131c0 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 26 Jun 2006 18:21:37 +0200 Subject: 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 --- CREDITS | 5 +++++ lib/zlib_inflate/inftrees.c | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'CREDITS') diff --git a/CREDITS b/CREDITS index 1d35f10ec3b2..85c7c70b7044 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. diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c index 62343c53bf7e..da665fbb16aa 100644 --- a/lib/zlib_inflate/inftrees.c +++ b/lib/zlib_inflate/inftrees.c @@ -8,15 +8,6 @@ #define MAXBITS 15 -const char inflate_copyright[] = - " inflate 1.2.3 Copyright 1995-2005 Mark Adler "; -/* - If you use the zlib library in a product, an acknowledgment is welcome - in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this - copyright string in the executable of your product. - */ - /* Build a set of tables to decode the provided canonical Huffman code. The code lengths are lens[0..codes-1]. The result starts at *table, -- cgit v1.2.3 From d71624c95a231873ec3727ee9bff7b68e692de70 Mon Sep 17 00:00:00 2001 From: Thibaut Varene Date: Sun, 7 May 2006 04:54:28 -0600 Subject: [PARISC] Update Thibaut Varene's CREDITS entry Signed-off-by: Thibaut VARENE Signed-off-by: Kyle McMartin --- CREDITS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CREDITS') diff --git a/CREDITS b/CREDITS index 1d35f10ec3b2..70922bd656c2 100644 --- a/CREDITS +++ b/CREDITS @@ -3396,10 +3396,10 @@ S: Czech Republic N: Thibaut Varene E: T-Bone@parisc-linux.org -W: http://www.parisc-linux.org/ +W: http://www.parisc-linux.org/~varenet/ P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063 D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits -D: Some bits in an ARM port, S1D13XXX FB driver, random patches here and there +D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there D: AD1889 sound driver S: Paris, France -- cgit v1.2.3