2.3.40

diff -u --recursive --new-file v2.3.39/linux/CREDITS linux/CREDITS
--- v2.3.39/linux/CREDITS   Tue Jan 11 22:31:35 2000
+++ linux/CREDITS   Mon Jan 17 22:19:08 2000
@@ -1638,6 +1638,15 @@
 E: orc@pell.chi.il.us
 D: improved memory detection code.
 
+N: Ivan Passos
+E: ivan@cyclades.com
+D: Author of the Cyclades-PC300 synchronous card driver
+D: Maintainer of the Cyclom-Y/Cyclades-Z asynchronous card driver
+S: Cyclades Corp
+S: 41934 Christy St
+S: Fremont, CA 94538
+S: USA
+
 N: Mikulas Patocka
 E: mikulas@artax.karlin.mff.cuni.cz
 W: http://artax.karlin.mff.cuni.cz/~mikulas/
@@ -2348,18 +2357,15 @@
 
 N: Lars Wirzenius
 E: liw@iki.fi
-D: Linux System Administrator's Guide
-D: Co-moderator, comp.os.linux.announce
+D: Linux System Administrator's Guide, author, former maintainer
+D: comp.os.linux.announce, former moderator
+D: Linux Documentation Project, co-founder
 D: Original sprintf in kernel
-D: Personal information about Linus
-D: Original kernel README
-D: Linux News (electronic magazine)
-D: Meta-FAQ, originator
+D: Original kernel README (for version 0.97)
+D: Linux News (electronic magazine, now dead), founder and former editor
+D: Meta-FAQ, originator, former maintainer
 D: INFO-SHEET, former maintainer
 D: Author of the longest-living linux bug
-S: Hernesaarenkatu 15 A 2
-S: Fin-00150 Helsinki
-S: Finland
 
 N: Jonathan Woithe
 E: jwoithe@physics.adelaide.edu.au