Import of Linux/MIPS 2.1.14

1 files changed, 729 insertions, 107 deletions

diff --git a/CREDITS b/CREDITS
index 2bda0cf13..a3213604f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,18 +2,38 @@
 	contributed to the linux project.  It is sorted by name, and
 	formatted in a format that allows for easy grepping and
 	beautification by scripts.  The fields are: name (N), email (E),
-	description (D) and snail-mail address (S).  Thanks,
+	web-address (W), PGP key ID and fingerprint (P), description (D)
+	and snail-mail address (S). 
+	Thanks,
 
 			Linus
 ----------
 
-M: Matti Aarnio
+N: Matti Aarnio
 E: mea@utu.fi
-D: Dynamicized network socket allocations, LILO for AHA1542
+D: LILO for AHA1542, modularized several of drivers/net/,
+D: dynamic SLIP devices, dynamic /proc/net/, true size /proc/ksyms,
+D: and other hacks..
+D: Documenting various parts of network subsystem (kernel side)
 
 N: Werner Almesberger
-E: almesber@bernina.ethz.ch
+E: werner.almesberger@lrc.di.epfl.ch
 D: dosfs, LILO, some fd features, various other hacks here and there
+S: Ecole Polytechnique Federale de Lausanne
+S: DI-LRC
+S: INR (Ecublens)
+S: CH-1015 Lausanne
+S: Switzerland
+
+N: H. Peter Anvin
+E: hpa@zytor.com
+W: http://www.zytor.com/~hpa/
+P: 2047/2A960705 BA 03 D3 2C 14 A8 A8 BD  1E DF FE 69 EE 35 BD 74
+D: Author of the SYSLINUX boot loader, maintainer of the linux.* news
+D: hierarchy and the Linux Device List; various kernel hacks
+S: 4390 Albany Dr. #46
+S: San Jose, California 95129
+S: USA
 
 N: Derek Atkins
 E: warlord@MIT.EDU
@@ -33,7 +53,8 @@ S: University of Calgary
 S: Calgary, Alberta, Canada
 
 N: Ralf Baechle
-E: ralf@waldorf-gmbh.de
+E: ralf@gnu.ai.mit.edu
+P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE  C8 BA 9C FC 88 DE 32 C3
 D: Linux/MIPS port
 D: Linux/68k hacker
 S: Hauptstrasse 19
@@ -47,7 +68,7 @@ D: Wrote SYS V IPC (part of standard kernel since 0.99.10)
 N: Dario Ballabio
 E: dario@milano.europe.dg.com
 D: Author and maintainer of the Ultrastor 14F/34F SCSI driver
-D: Author and maintainer of the EATA ISA/EISA SCSI driver
+D: Author and maintainer of the EATA ISA/EISA/PCI SCSI driver
 S: Data General Corporation
 S: Milano
 S: Italy
@@ -87,8 +108,8 @@ S: USA
 N: Randolph Bentson
 E: bentson@grieg.seaslug.org
 D: author of driver for Cyclades Cyclom-Y async mux
-S: 2500 Gilman Dr W, #404
-S: Seattle, Washington 98119-2102
+S: 2322 37th Ave SW
+S: Seattle, Washington 98126-2010
 S: USA
 
 N: Stephen R. van den Berg (AKA BuGless)
@@ -109,6 +130,23 @@ N: Ross Biro
 E: bir7@leland.Stanford.Edu
 D: Original author of the Linux networking code
 
+N: Philip Blundell
+E: pjb27@cam.ac.uk 
+E: pb@nexus.co.uk
+E: phil@tazenda.demon.co.uk
+D: Device driver hacking (especially EtherExpress16/3C505 net cards)
+D: Some Linux/ARM stuff
+S: Trinity College
+S: Cambridge, UK. CB2 1TQ
+
+N: Thomas Bogendoerfer
+E: tsbogend@bigbug.franken.de
+D: Lance32 driver
+D: strace for Linux/Alpha
+S: Baumgartenweg 5
+S: 91452 Wilhermsdorf
+S: Germany
+
 N: Bill Bogstad
 E: bogstad@cs.jhu.edu
 D: Wrote /proc/self patch
@@ -117,6 +155,12 @@ S: Computer Science Department
 S: Baltimore, Maryland 21218
 S: USA
 
+N: Axel Boldt
+E: boldt@math.ucsb.edu
+W: http://math-www.uni-paderborn.de/~axel/
+D: Configuration help text support
+D: Linux CD and Support Giveaway List
+
 N: John Boyd
 E: boyd@cis.ohio-state.edu
 D: Co-author of wd7000 SCSI driver
@@ -126,11 +170,17 @@ S: USA
 
 N: Andries Brouwer
 E: aeb@cwi.nl
-D: International character handling for keyboard and console
+D: random Linux hacker
 S: Bessemerstraat 21
 S: Amsterdam
 S: The Netherlands
 
+N: Ray Burr
+E: ryb@nightmare.com
+D: Original author of Amiga FFS filesystem
+S: Orlando, Florida
+S: USA
+
 N: Michael Callahan
 E: callahan@maths.ox.ac.uk
 D: PPP for Linux
@@ -157,6 +207,21 @@ S: 48287 Sawleaf
 S: Fremont, California 94539
 S: USA
 
+N: Gordon Chaffee
+E: chaffee@plateau.cs.berkeley.edu
+D: vfat filesystem
+S: 3674 Oakwood Terrace #201
+S: Fremont, California 94536
+S: USA
+
+N: Chih-Jen Chang     
+E: chihjenc@scf.usc.edu
+E: chihjen@iis.sinica.edu.tw
+D: IGMP(Internet Group Management Protocol) version 2
+S: 3F, 65 Tajen street
+S: Tamsui town, Taipei county,
+S: Taiwan 251, Republic of China
+
 N: Raymond Chen
 E: raymondc@microsoft.com
 D: Author of Configure script
@@ -164,14 +229,50 @@ S: 14509 NE 39th Street #1096
 S: Bellevue, Washington 98007
 S: USA
 
+N: Stuart Cheshire
+E: cheshire@cs.stanford.edu
+D: Author of Starmode Radio IP (STRIP) driver
+D: Originator of design for new combined interrupt handlers
+S: William Gates Department
+S: Stanford University
+S: Stanford, California 94305
+S: USA
+
+N: Juan Jose Ciarlante
+E: jjciarla@raiz.uncu.edu.ar
+E: juanjo@irriga.uncu.edu.ar
+D: Network driver alias support
+D: IP masq hashing and app modules
+S: Las Cuevas 2385 - Bo Guemes
+S: Las Heras, Mendoza CP 5539
+S: Argentina
+
+N: Hamish Coleman
+E: hamish@zot.apana.org.au
+D: SEEQ8005 network driver
+S: 98 Paxton Street
+S: East Malvern, Victoria, 3145
+S: Australia
+
 N: Alan Cox
-E: A.Cox@swansea.ac.uk
-E: iiitac@pyr.swan.ac.uk
-E: gw4pts@gw4pts.ampr.org
+E: alan@lxorguk.ukuu.org.uk (linux related - except big patches)
+E: iialan@www.linux.org.uk (linux.org.uk/big patches)
+E: alan@cymru.net (commercial CymruNET stuff)
+E: gw4pts@gw4pts.ampr.org (amateur radio stuff)
 E: GW4PTS@GB7SWN (packet radio)
-D: NET2Debugged author
+E: Please don't use iialan@iifeak.swan.ac.uk for Linux stuff
+S: c/o 3Com/I^2IT Limited
+S: The Innovation Centre
+S: University Of Wales
+S: Swansea, SA2 8PP
+S: Wales, UK
+D: NET2Debugged/NET3 author
 D: Network layer debugging
-D: AX.25 & IPX alpha releases
+D: Initial AX.25 & IPX releases
+D: Original Linux netatalk patches.
+D: Current 3c501 hacker. >>More 3c501 info/tricks wanted<<.
+D: Watchdog timer drivers
+D: Linux/SMP
 
 N: Laurence Culhane
 E: loz@holmes.demon.co.uk
@@ -181,25 +282,52 @@ S: Northampton
 S: NN1 3QT
 S: United Kingdom
 
+N: Ray Dassen
+E: jdassen@wi.LeidenUniv.nl
+W: http://www.wi.leidenuniv.nl/~jdassen/
+P: 1024/672D05C1 DD 60 32 60 F7 90 64 80  E7 6F D4 E4 F8 C9 4A 58
+D: Debian GNU/Linux: www.debian.org maintainer, FAQ co-maintainer,
+D: packages testing, nit-picking & fixing. Enjoying BugFree (TM) kernels.
+S: Zuidsingel 10A
+S: 2312 SB  Leiden
+S: The Netherlands
+
+N: David Davies
+E: davies@wanton.lkg.dec.com
+S: Digital Equipment Corporation
+S: 550 King Street
+S: Littleton, MA 01460
+S: U.S.A.
+D: Network driver author - depca, ewrk3 and de4x5
+D: Wrote shared interrupt support
+
 N: Wayne Davison
 E: davison@borland.com
 D: Second extended file system co-designer
 
 N: Terry Dawson
-E: terryd@extro.ucc.su.oz.au
-E: vk2ktj@gw.vk2ktj.ampr.org (Amateur Radio use only)
-D: NET-2-HOWTO author.
-D: RADIOLINUX Amateur Radio software for Linux list collator.
+E: terry@perf.no.itg.telecom.com.au
+E: terry@albert.vk2ktj.ampr.org (Amateur Radio use only)
+D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO
 
 N: Todd J. Derr
-E: tjd@cs.pitt.edu
+E: tjd@fore.com
+D: x86 VESA console blanking enhancements
 D: maintainer of dual-monitor patches for 1.0+
 D: MouseMan driver for selection
-S: Department of Computer Science
-S: University of Pittsburgh
-S: Pittsburgh, Pennsylvania 15260
+S: Fore Systems, Inc.
+S: 5800 Corporate Drive
+S: Pittsburgh, Pennsylvania 15237-5829
 S: USA
 
+N: Eddie C. Dost
+E: ecd@skynet.be
+D: Linux/Sparc kernel hacker
+D: New Linux/Sparc maintainer (while davem is at SGI)
+S: Rue de la Chapelle 51
+S: 4850 Moresnet
+S: Belgium
+
 N: Thomas Dunbar
 E: tdunbar@vtaix.cc.vt.edu
 D: TeX & METAFONT hacking/maintenance
@@ -225,26 +353,47 @@ S: 2255 Spruce
 S: Boulder, Colorado 80302
 S: USA
 
+N: Heiko Eissfeldt
+E: heiko@colossus.escape.de heiko@unifix.de
+D: verify_area stuff, generic scsi fixes
+D: SCSI Programming HOWTO
+D: POSIX.1 compliance testing
+S: Unifix Software GmbH
+S: Bueltenweg 27a
+S: D-38106 Braunschweig
+S: Germany
+
 N: Bjorn Ekwall
 E: bj0rn@blox.se
+W: http://www.pi.se/blox/
 D: Extended support for loadable modules
 D: D-Link pocket adapter drivers
 S: Myrstuguv. 83
 S: S-143 32 VARBY
 S: Sweden
 
+N: Paal-Kristian Engstad
+E: engstad@funcom.com
+D: Kernel smbfs (to mount WfW, NT and OS/2 network drives.)
+S: Oscars gt. 35
+S: N-0258 OSLO
+S: Norway
+
 N: Doug Evans
 E: dje@cygnus.com
 D: Wrote Xenix FS (part of standard kernel since 0.99.15)
 
 N: Rik Faith
 E: faith@cs.unc.edu
-D: Future Domain TMC-16x0 SCSI driver
+E: r.faith@ieee.org
+D: Author: Future Domain TMC-16x0 SCSI driver
+D: Debugging: SCSI code; Cyclades serial driver; APM driver
+D: Debugging: XFree86 Mach 32 server, accelerated server code
 
-N: Juergen Fischer
-E: fischer@server.et-inf.fho-emden.de
+N: Jürgen Fischer
+E: fischer@et-inf.fho-emden.de (=?iso-8859-1?q?J=FCrgen?= Fischer)
 D: Author of Adaptec AHA-152x scsi driver
-S: Schulstrasse 18
+S: Schulstraße 18
 S: 26506 Norden
 S: Germany
 
@@ -259,6 +408,11 @@ S: Australia
 N: Ralf Flaxa
 E: rfflaxa@immd4.informatik.uni-erlangen.de
 D: The Linux Support Team Erlangen
+D: Creator of LST distribution
+D: Author of installation tool LISA
+S: Pfitznerweg 6
+S: 74523 Schwaebisch Hall
+S: Germany
 
 N: Lawrence Foard
 E: entropy@world.std.com
@@ -274,12 +428,19 @@ S: 1123 North Oak Park Avenue
 S: Oak Park, Illinois 60302
 S: USA
 
+N: Bob Frey
+E: bobf@advansys.com
+D: AdvanSys SCSI driver
+S: 1150 Ringwood Court
+S: San Jose, California 95131
+S: USA
+
 N: Nigel Gamble
 E: nigel@nrg.org
 E: nigel@sgi.com
 D: Interrupt-driven printer driver
-S: 765 N Rengstorff Ave, Apartment 7
-S: Mountain View, California 94043-2420
+S: 120 Alley Way
+S: Mountain View, California 94040
 S: USA
 
 N: Jacques Gelinas
@@ -290,23 +451,71 @@ S: Laval, Quebec
 S: Canada H7Y 1V9
 
 N: David Gentzel
-E: gentzel@nova.enet.dec.com
-D: BusLogic driver and original UltraStor driver
+E: gentzel@telerama.lm.com
+D: Original BusLogic driver and original UltraStor driver
 S: Whitfield Software Services
-S: 631 Idlewood Avenue
-S: Carnegie, Pennsylvania 15106-1126
+S: 600 North Bell Avenue, Suite 160
+S: Carnegie, Pennsylvania 15106-4304
 S: USA
 
 N: Philip Gladstone
 E: philipg@onsett.com
 D: Kernel / timekeeping stuff
 
+N: Michael A. Griffith
+E: grif@cs.ucr.edu
+W: http://www.cs.ucr.edu/~grif
+D: Loopback speedup, qlogic scsi hacking, VT_LOCKSWITCH
+S: Department of Computer Science
+S: University of California, Riverside
+S: Riverside, California  92521-0304
+S: USA
+
+N: Dmitry S. Gorodchanin
+E: begemot@bgm.rosprint.net
+D: RISCom/8 driver, misc kernel fixes.
+S: 6/1 M.Koneva bl, apt #125 
+S: Poltava 314023
+S: Ukraine
+
+N: Paul Gortmaker
+E: gpg109@rsphy1.anu.edu.au
+W: http://rsphy1.anu.edu.au/~gpg109
+D: Real Time Clock driver author.
+D: 8390 net driver hacker (ne2000, wd8013, smc-ultra, 3c503, etc.) 
+D: Ethernet-HowTo and BootPrompt-HowTo author.
+D: Added many new CONFIG options (modules, ramdisk, generic-serial, etc.)
+D: Implemented 1st "official" kernel thread (moved user bdflush to kflushd)
+D: Various other random hacks, patches and utilities.
+
+N: John E. Gotts
+E: jgotts@engin.umich.edu
+D: kernel hacker
+S: 8124 Constitution Apt. 7
+S: Sterling Heights, Michigan  48313
+S: USA
+
+N: Grant Guenther
+E: grant@torque.net
+D: Iomega PPA / ZIP driver
+S: 906-1001 Bay St.
+S: Toronto, Ontario, M5S 3A6 
+S: Canada
+
+N: Danny ter Haar
+E: dth@cistron.nl
+D: /proc/procinfo, reboot on panic , kernel pre-patch tester ;)
+S: Cistron Internet Services
+S: PO-Box 297
+S: 2400 AG, Alphen aan den Rijn
+S: The Netherlands
+
 N: Bruno Haible
 E: haible@ma2s2.mathematik.uni-karlsruhe.de
-D: Unified SysV FS based on Xenix FS (part of standard kernel since 0.99.15)
-S: Augartenstrasse 40
-S: D - 76137 Karlsruhe
-S: Germany
+D: SysV FS, shm swapping, memory management fixes
+S: 17 rue Danton
+S: F - 94270 Le Kremlin-Bicêtre
+S: France
 
 N: Greg Hankins
 E: gregh@cc.gatech.edu
@@ -315,12 +524,28 @@ S: 25360 Georgia Tech Station
 S: Atlanta, Georgia 30332
 S: USA
 
+N: Angelo Haritsis
+E: ah@doc.ic.ac.uk
+D: kernel patches (serial, watchdog)
+D: xringd, vuzkern, greekXfonts
+S: 58 Henfield Close
+S: London N19 3UL
+S: United Kingdom
+
+N: Kai Harrekilde-Petersen
+E: khp@dolphinics.no
+D: Original author of the ftape-HOWTO, i82078 fdc detection code.
+S: Peder Holters vei 13
+S: 1168 Oslo
+S: Norway
+
 N: Andrew Haylett
 E: ajh@primag.co.uk
 D: Selection mechanism
 
 N: Jochen Hein
-E: Hein@Informatik.TU-Clausthal.de
+E: jochen.hein@informatik.tu-clausthal.de
+P: 1024/4A27F015 25 72 FB E3 85 9F DE 3B  CB 0A DA DA 40 77 05 6C
 D: National Language Support
 D: German Support-Disks for SLS/Slackware called SLT
 D: Linux Internationalization Project
@@ -329,6 +554,21 @@ S: Muehlenweg 19
 S: 34266 Niestetal
 S: Germany
 
+N: Richard Henderson
+E: rth@tamu.edu
+D: Alpha/ELF, gcc, binutils, and glibc
+S: 304 E. North Ave.
+S: Bryan, Texas  77801-3431
+S: USA
+
+N: Sebastian Hetze
+E: she@lunetix.de
+D: German Linux Documentation,
+D: Organization of German Linux Conferences
+S: Danckelmannstr. 48
+S: 14059 Berlin
+S: Germany
+
 N: Michael Hipp
 E: mhipp@student.uni-tuebingen.de
 D: drivers for the racal ni5210 & ni6510 ethernet-boards
@@ -344,6 +584,14 @@ S: 46030 Manekin Plaza, Suite 160
 S: Dulles, Virginia 20166
 S: USA
 
+N: Kenji Tsutomu Hollis
+E: khollis@bitgate.com
+W: http://www.nurk.org/
+D: Berkshire PC Watchdog Driver
+S: PO Box 15
+S: Grants Pass, Oregon 97526
+S: USA
+
 N: Nick Holloway
 E: Nick.Holloway@alfie.demon.co.uk
 E: Nick.Holloway@parallax.co.uk
@@ -373,6 +621,13 @@ S: Panoramastrasse 18
 S: D-69126 Heidelberg
 S: Germany
 
+N: Miguel de Icaza Amozurrutia
+E: miguel@nuclecu.unam.mx
+D: Linux/SPARC team, Midnight Commander maintainer
+S: Avenida Copilco 162, 22-1003
+S: Mexico, DF
+S: Mexico
+
 N: Ian Jackson
 E: iwj10@cus.cam.ac.uk
 E: ijackson@nyx.cs.du.edu
@@ -399,7 +654,9 @@ S: RG6 2NU
 S: United Kingdom
 
 N: Michael K. Johnson
-E: johnsonm@sunsite.unc.edu
+E: johnsonm@redhat.com
+W: http://www.redhat.com/~johnsonm
+P: 1024/4536A8DD 2A EC 88 08 40 64 CE D8  DD F8 12 2B 61 43 83 15
 D: The Linux Documentation Project
 D: Kernel Hackers' Guide
 D: Procps
@@ -410,6 +667,14 @@ S: 201 Howell Street, Apartment 1C
 S: Chapel Hill, North Carolina 27514-4818
 S: USA
 
+N: Bernhard Kaindl
+E: edv@bartelt.via.at
+D: Author of a menu based configuration tool, kmenu, which 
+D: is the predecessor of 'make menuconfig' and 'make xconfig'.
+S: Tallak 95
+S: 8103 Rein
+S: Austria
+
 N: Fred N. van Kempen
 E: waltje@uwalt.nl.mugnet.org
 D: NET-2
@@ -419,6 +684,14 @@ S: Hoefbladhof 27
 S: 2215 DV Voorhout
 S: The Netherlands
 
+N: Karl Keyte
+E: kkeyte@koft.rhein-main.de
+E: kkeyte@esoc.esa.de
+D: Disk usage statistics and modifications to line printer driver
+S: Erbacher Strasse 6
+S: D-64283 Darmstadt
+S: Germany
+
 N: Olaf Kirch
 E: okir@monad.swb.de
 D: Author of the Linux Network Administrators' Guide
@@ -434,12 +707,15 @@ S: Santa Clara, California 95050-3452
 S: USA
 
 N: Alain L. Knaff
-E: Alain.Knaff@imag.fr
+E: Alain.Knaff@poboxes.com
 D: floppy driver
-S: Appartement 310B
-S: 11, rue General Mangin
-S: 38100 Grenoble
-S: France
+S: 2a, rue de l'Acier
+S: L-4505 Differdange
+S: Luxembourg
+
+N: Gerd Knorr
+E: kraxel@cs.tu-berlin.de
+D: SCSI CD-ROM driver hacking, minor bug fixes
 
 N: Harald Koenig
 E: koenig@tat.physik.uni-tuebingen.de
@@ -452,6 +728,30 @@ N: Rudolf Koenig
 E: rfkoenig@immd4.informatik.uni-erlangen.de
 D: The Linux Support Team Erlangen
 
+N: Willy Konynenberg
+E: willy@xos.nl
+W: http://www.xos.nl/
+D: IP transparent proxy support
+S: X/OS Experts in Open Systems BV
+S: Kruislaan 419
+S: 1098 VA Amsterdam 
+S: The Netherlands
+
+N: Gero Kuhlmann
+E: gero@gkminix.han.de
+D: mounting root via NFS
+S: Donarweg 4
+S: D-30657 Hannover
+S: Germany
+
+N: Markus Kuhn
+E: mskuhn@cip.informatik.uni-erlangen.de
+W: http://wwwcip.informatik.uni-erlangen.de/user/mskuhn
+D: Unicode, real-time, time, standards
+S: Schlehenweg 9
+S: D-91080 Uttenreuth
+S: Germany
+
 N: Bas Laarhoven
 E: bas@vimec.nl
 D: Loadable modules and ftape driver
@@ -459,6 +759,19 @@ S: Mr. v. Boemellaan 39
 S: NL-5237 KA 's-Hertogenbosch
 S: The Netherlands
 
+N: Savio Lam
+E: lam836@cs.cuhk.hk
+D: Author of the dialog utility, foundation
+D: for Menuconfig's lxdialog.
+
+N: Volker Lendecke
+E: lendecke@namu01.Num.Math.Uni-Goettingen.de
+D: Kernel smbfs (to mount WfW, NT and OS/2 network drives.)
+D: NCP filesystem support (to mount NetWare volumes)
+S: Innersteweg 11
+S: 37081 Goettingen
+S: Germany
+
 N: Kevin Lentin
 E: kevinl@cs.monash.edu.au
 D: NCR53C400/T130B SCSI extension to NCR5380 driver.
@@ -473,23 +786,35 @@ S: Am Muehlenweg 38
 S: D53424 Remagen
 S: Germany
 
+N: Phil Lewis
+E: beans@bucket.ualr.edu
+D: Promised to send money if I would put his name in the source tree.
+S: PO Box 371
+S: North Little Rock, Arkansas 72115
+S: US
+
+N: Martin von Loewis
+E: loewis@informatik.hu-berlin.de
+D: script binary format
+
 N: Mark Lord
-E: mlord@bnr.ca
-E: mlord@achilles.net
-D: IDE drive support in hd.c
+E: mlord@pobox.com
+D: Author of IDE driver (ide.c), hd.c support
+D: Triton Bus Master IDE driver
+D: Hard Disk Parameter (hdparm) utility
 S: 33 Ridgefield Cr
 S: Nepean, Ontario
 S: Canada K2H 6S3
 
 N: Warner Losh
-E: imp@boulder.parcplace.com
-D: Provided OI/OB for Linux, general hacker
-S: 4909 Pearl East Circle, Suite 200
-S: Boulder, Colorado 80303
+E: imp@village.org
+D: Linux/MIPS Deskstation support, Provided OI/OB for Linux
+S: 8786 Niwot Rd
+S: Niwot, CO 80503
 S: USA
 
 N: H.J. Lu
-E: hjl@nynexst.com
+E: hjl@gnu.ai.mit.edu
 D: GCC + libraries hacker
 
 N: Tuomas J. Lukka
@@ -500,7 +825,7 @@ S: Puistokaari 1 E 18
 S: 00200 Helsinki
 S: Finland
 
-N: Kai M"akisara
+N: Kai Mäkisara
 E: Kai.Makisara@metla.fi
 D: SCSI Tape Driver
 
@@ -516,7 +841,8 @@ D: SLS distribution
 D: Initial implementation of VC's, pty's and select()
 
 N: James B. MacLean
-E: jmaclean@fox.nstn.ns.ca
+E: macleajb@ednet.ns.ca
+W: http://www.ednet.ns.ca/~macleajb/dosemu.html
 D: Coordinator of DOSEMU releases
 D: Program in DOSEMU
 S: PO BOX 220, HFX. CENTRAL
@@ -531,6 +857,16 @@ S: 25 McMillan Street
 S: Victoria Park 6100
 S: Australia
 
+N: Martin Mares
+E: mj@k332.feld.cvut.cz
+D: BIOS video mode handling code
+D: Miscellaneous kernel fixes
+D: MOXA C-218 serial board driver
+D: BOOTP support
+S: Kankovskeho 1241
+S: 182 00 Praha 8
+S: Czech Republic 
+
 N: John A. Martin
 E: jam@acm.org
 D: FSSTND contributor
@@ -539,12 +875,21 @@ D: Credit file compilator
 N: Kevin E. Martin
 E: martin@cs.unc.edu
 D: Developed original accelerated X servers included in XFree86
-D: XF86_Mach64 (forthcoming -- please don't ask when)
+D: XF86_Mach64
 D: XF86_Mach32
 D: XF86_Mach8
 D: XF86_8514
 D: cfdisk (curses based disk partitioning program)
 
+N: Mike McLagan
+E: mike.mclagan@linux.org
+W: http://www.invlogic.com/~mmclagan
+D: DLCI/FRAD drivers for Sangoma SDLAs
+S: Innovative Logic Corp
+S: P.O. Box 1068
+S: Laurel, MD  20732
+S: USA
+
 N: Bradley McLean
 E: brad@bradpc.gaylord.com
 D: Device driver hacker
@@ -556,10 +901,27 @@ S: USA
 N: Dirk Melchers
 E: dirk@merlin.nbg.sub.org
 D: 8 bit XT hard disk driver for OMTI5520
-S: Branderweg 4
-S: D-91058 Erlangen
+S: Heidackerstrass 19
+S: D-91056 Erlangen
+S: Germany
+
+N: Michael Meskes
+E: meskes@informatik.rwth-aachen.de
+D: Kernel hacker. Software watchdog daemon.
+D: Maintainer of several Debian packages
+S: Lehrstuhl fuer angewandte Mathematik insb. Informatik
+S: RWTH-Aachen
+S: D-52056 Aachen
 S: Germany
 
+N: Nigel Metheringham
+E: Nigel.Metheringham@ThePLAnet.net
+P: 1024/31455639 B7 99 BD B8 00 17 BD 46  C1 15 B8 AB 87 BC 25 FA
+D: IP Masquerading work and minor fixes
+S: Planet Online
+S: The White House, Melbourne Street, LEEDS
+S: LS2  7PS,   UK
+
 N: Craig Metz
 E: cmetz@tjhsst.edu
 D: Some of PAS 16 mixer & PCM support
@@ -568,8 +930,7 @@ S: Fairfax, Virginia 22033
 S: USA
 
 N: William (Bill) Metzenthen
-E: billm@vaxc.cc.monash.edu.au
-E: billm@jacobi.maths.monash.edu.au
+E: billm@suburbia.net
 D: Author of the FPU emulator.
 D: Minor kernel hacker for other lost causes (Hercules mono, etc).
 S: 22 Parker Street
@@ -595,14 +956,14 @@ S: East Brunswick, New Jersey 08816
 S: USA
 
 N: Rick Miller
-E: rick@discus.mil.wi.us
-D: Linux Device Registrar (Major/minor numbers), "au-play", "bwBASIC"
+E: rick@digalogsys.com
+D: Original Linux Device Registrar (Major/minor numbers), au-play, bwBASIC
 S: S78 W16203 Woods Road
 S: Muskego, Wisconsin 53150
 S: USA
 
 N: Harald Milz
-E: hm@ix.de
+E: hm@seneca.linux.de
 D: Linux Projects Map, Linux Commercial-HOWTO
 D: general Linux publicity in Germany, vacation port
 D: UUCP and CNEWS binary packages for LST
@@ -625,6 +986,13 @@ S: Reinholdstrasse 14
 S: D-37083 Goettingen
 S: Germany
 
+N: David Mosberger-Tang
+E: davidm@azstarnet.com
+D: Linux/Alpha
+S: 2552 E. Copper Street
+S: Tucson, AZ 85716-2406
+S: USA
+
 N: Ian A. Murdock
 E: imurdock@gnu.ai.mit.edu
 D: Creator of Debian distribution
@@ -639,20 +1007,34 @@ S: Dragonvagen 1 A 13
 S: FIN-00330 Helsingfors
 S: Finland
 
+N: Jonathan Naylor
+E: jsn@cs.nott.ac.uk
+E: g4klx@amsat.org
+E: G4KLX@GB7DAD (Packet Radio)
+D: AX.25 and NET/ROM protocol suites
+S: 24 Castle View Drive
+S: Cromford
+S: Matlock
+S: Derbyshire DE4 3RL
+S: United Kingdom
+
 N: Michael Neuffer
+E: mike@i-Connect.Net
 E: neuffer@goofy.zdv.uni-mainz.de
-D: developer and maintainer of the eata_dma SCSI driver 
+W: http://www.i-Connect.Net/~mike/
+D: Developer and maintainer of the EATA-DMA SCSI driver
+D: Co-developer EATA-PIO SCSI driver
+D: /proc/scsi and assorted other snippets 
 S: Zum Schiersteiner Grund 2
 S: 55127 Mainz
 S: Germany
 
 N: David C. Niemi
-E: niemidc@clark.net
-E: niemidc@slma.com
-D: FSSTND, The XFree86 Project
-D: DMA memory support, floppy driver
+E: niemi@erols.com
+D: Assistant maintainer of Mtools, fdutils, and floppy driver
+D: Administrator of WAUUG Linux Server, http://linux.wauug.org
 S: 2364 Old Trail Drive
-S: Reston, Virginia 22091
+S: Reston, Virginia 20191
 S: USA
 
 N: Michael O'Reilly
@@ -669,19 +1051,48 @@ N: Greg Page
 E: greg@caldera.com
 D: IPX development and support
 
+N: Barak A. Pearlmutter
+E: bap@cs.unm.edu
+W: http://www.cs.unm.edu/~bap/
+P: 512/602D785D 9B A1 83 CD EE CB AD 93  20 C6 4C B7 F5 E9 60 D4
+D: Author of mark-and-sweep GC integrated by Alan Cox
+S: Computer Science Department
+S: FEC 313
+S: University of New Mexico
+S: Albuquerque, NM  87131
+S: USA
+
+N: Avery Pennarun
+E: apenwarr@foxnet.net
+D: ARCnet driver
+D: "make xconfig" improvements
+D: Various minor hacking
+S: RR #5, 497 Pole Line Road
+S: Thunder Bay, Ontario
+S: CANADA P7C 5M9
+
+N: Yuri Per
+E: yuri@pts.mipt.ru
+D: Some smbfs fixes
+S: Demonstratsii 8-382
+S: Tula 300000
+S: Russia
+
 N: Kai Petzke
 E: wpp@marie.physik.tu-berlin.de
+W: http://physik.tu-berlin.de/~wpp
+P: 1024/B42868C1 D9 59 B9 98 BB 93 05 38  2E 3E 31 79 C3 65 5D E1 
 D: Driver for Laser Magnetic Storage CD-ROM
-D: Some kernel bug fixes, new swapping routine
+D: Some kernel bug fixes
 D: Port of the database Postgres
-S: Stresemannstr. 62
-S: 10963 Berlin
+D: "Unix fuer Jedermann" a German introduction to linux (see my web page)
+S: M"ullerstr. 69
+S: 13349 Berlin
 S: Germany
 
 N: Ken Pizzini
 E: ken@halcyon.com
 D: CDROM driver "sonycd535" (Sony CDU-535/531)
-S: 
 
 N: Frederic Potter 
 E: Frederic.Potter@masi.ibp.fr 
@@ -692,12 +1103,49 @@ E: snprobst@immd4.informatik.uni-erlangen.de
 D: The Linux Support Team Erlangen
 
 N: Daniel Quinlan
-E: quinlan@yggdrasil.com
-D: FSSTND Coordinator
-S: 816 Saratoga Avenue, Apartment M208
+E: quinlan@pathname.com
+W: http://www.pathname.com/~quinlan/
+D: FSSTND coordinator; FHS editor
+D: random Linux documentation, patches, and hacks
+S: 4390 Albany Dr. #41A
 S: San Jose, California 95129
 S: USA
 
+N: Eric S. Raymond
+E: esr@thyrsus.com
+W: http://www.ccil.org/~esr/home.html
+D: ncurses library co-maintainer
+D: terminfo master file maintainer
+D: Distributions HOWTO editor
+D: Instigator, FHS standard
+D: Keeper of the Jargon File and curator of the Retrocomputing Museum
+D: Author, Emacs VC and GUD modes
+S: 22 South Warren Avenue
+S: Malvern, Pennsylvania 19355
+S: USA
+
+N: Stefan Reinauer
+E: stepan@home.culture.mipt.ru
+W: http://home.culture.mipt.ru/~stepan
+D: Modularized affs and ufs. Minor fixes.
+S: Rebmannsweg 34h
+S: 79539 Loerrach
+S: Germany
+
+N: Joerg Reuter
+E: jreuter@lykos.oche.de
+E: dl1bke@db0pra.ampr.org
+D: Generic Z8530 driver, AX.25 DAMA slave implementation
+D: Several AX.25 hacks
+
+N: William E. Roadcap
+E: roadcapw@cfw.com
+W: http://www.cfw.com/~roadcapw
+D: Author of menu based configuration tool, Menuconfig.
+S: 1407 Broad Street
+S: Waynesboro, Virginia  22980
+S: USA
+
 N: Florian La Roche
 E: rzsfl@rz.uni-sb.de
 E: flla@stud.uni-sb.de
@@ -707,16 +1155,32 @@ S: 7000 Stuttgart 50
 S: Germany
 
 N: Stephen Rothwell
-E: sfr@pdact.pd.necisa.oz.au
+E: Stephen.Rothwell@canb.auug.org.au
 D: Boot/setup/build work for setup > 2K
+D: Author, APM driver
 S: 59 Bugden Avenue
 S: Gowrie ACT 2904
 S: Australia
 
+N: Gerard Roudier
+E: groudier@iplus.fr
+D: Contributed to asynchronous read-ahead improvement
+S: 21 Rue Carnot
+S: 95170 Deuil La Barre
+S: France
+
 N: Alessandro Rubini
 E: rubini@ipvvis.unipv.it
 D: the gpm mouse server and kernel support for it
 
+N: Thomas Sailer
+E: sailer@ife.ee.ethz.ch
+E: HB9JNX@HB9W.CHE.EU (packet radio)
+D: Baycom and Soundcard radio modem driver
+S: Weinbergstrasse 76
+S: 8408 Winterthur
+S: Switzerland
+
 N: Robert Sanders
 E: gt8134b@prism.gatech.edu
 D: Dosemu
@@ -728,6 +1192,16 @@ S: Hiekkalaiturintie 3 A 8
 S: 00980 Helsinki
 S: Finland
 
+N: Eric Schenk
+E: schenk@cs.toronto.edu
+D: Random kernel debugging.
+D: SYSV Semaphore code rewrite.
+D: Network layer debugging.
+D: Dial on demand facility (diald).
+S: 7 Borden Street
+S: Toronto, Ontario
+S: Canada M5S 2M8
+
 N: Peter De Schrijver
 E: stud11@cc4.kuleuven.ac.be
 D: Mitsumi CD-ROM driver patches March version
@@ -735,11 +1209,47 @@ S: Molenbaan 29
 S: B2240 Zandhoven
 S: Belgium
 
+N: Martin Schulze
+E: joey@linux.de
+W: http://home.pages.de/~joey/
+D: Random Linux Hacker, Linux Promoter
+D: CD-List, Books-List, Ex-FAQ
+D: Linux-Support, -Mailbox, -Stammtisch
+D: several improvements to system programs
+S: Oldenburg, Germany
+
 N: Darren Senn
-E: sinster@scintilla.santa-clara.ca.us
+E: sinster@darkwater.com
 D: Whatever I notice needs doing (so far: itimers, /proc)
-S: 620 Park View Drive #206
-S: Santa Clara, California 95054
+S: POB 64132
+S: Sunnyvale, California 94088-4132
+S: USA
+
+N: Simon Shapiro
+E: shimon@i-Connect.Net
+W: http://www.-i-Connect.Net/~shimon
+D: SCSI debugging
+D: Maintainer of the Debian Kernel packages
+S: 14355 SW Allen Blvd., Suite #140
+S: Beaverton, OR 97008
+S: USA
+
+N: Mike Shaver
+E: shaver@ingenia.com
+W: http://neon.ingenia.com/~shaver/
+D: Network hacking, /proc/sys/net
+S: c/o Ingenia Communications Corporation
+S: Suite 4200, CTTC Building
+S: 1125 Colonel By Drive
+S: Ottawa, Ontario
+S: Canada K1S 5R1
+
+N: John Shifflett
+E: john@geolog.com
+E: jshiffle@netcom.com
+D: Always IN2000 SCSI driver
+D: wd33c93 SCSI driver (linux-m68k)
+S: San Jose, California
 S: USA
 
 N: Rick Sladkey
@@ -751,12 +1261,29 @@ S: 24 Avon Place
 S: Arlington, Massachusetts 02174
 S: USA
 
+N: Craig Small
+E: csmall@triode.apana.org.au
+E: vk2xlz@gonzo.vk2xlz.ampr.org (packet radio)
+S: 10 Stockalls Place
+S: Minto, NSW, 2566
+S: Australia
+D: Gracilis PackeTwin device driver
+D: RSPF daemon 
+
 N: Chris Smith
 E: csmith@convex.com
 D: HPFS filesystem
 S: Richardson, Texas
 S: USA
 
+N: Miquel van Smoorenburg
+E: miquels@cistron.nl
+D: Kernel and net hacker. Sysvinit, minicom. doing Debian stuff.
+S: Cistron Internet Services
+S: PO-Box 297
+S: 2400 AG, Alphen aan den Rijn
+S: The Netherlands
+
 N: Scott Snyder
 E: snyder@fnald0.fnal.gov
 D: ATAPI cdrom driver
@@ -765,21 +1292,41 @@ S: Post Office Box 500
 S: Batavia, Illinois 60510
 S: USA
 
+N: Leo Spiekman
+E: leo@netlabs.net
+W: http://www.netlabs.net/hp/leo/
+D: Optics Storage 8000AT cdrom driver
+S: Cliffwood, NJ 07721
+S: USA
+
+N: Henrik Storner
+E: storner@osiris.ping.dk
+E: storner@olicom.dk
+W: http://eolicom.olicom.dk/~storner/
+D: Configure script: tristate, bugfixes
+D: vfat/msdos integration, kerneld docs, Linux promotion
+S: Chr. Winthersvej 1 B, st.th.
+S: DK-1860 Frederiksberg C
+S: Denmark
+
 N: Drew Sullivan
-E: drew@lethe.north.net
+E: drew@ss.org
+W: http://www.ss.org/
+P: 1024/ACFFA969 5A 9C 42 AB E4 24 82 31  99 56 00 BF D3 2B 25 46
 D: iBCS2 developer
 S: 22 Irvington Cres.
 S: Willowdale, Ontario
 S: Canada M2N 2Z1
 
 N: Tommy Thorn
-E: Tommy.Thorn@daimi.aau.dk
+E: Tommy.Thorn@irisa.fr
+W: http://www.irisa.fr/prive/thorn/index.html
+P: 512/B4AFC909 BC BF 6D B1 52 26 1E D6  E3 2F A3 24 2A 84 FE 21
 D: Device driver hacker (aha1542 & plip)
-S: Aarhus University
-S: Computer Science Department
-S: Ny Munkegade 116
-S: DK-8000 Aarhus C
-S: Denmark
+S: IRISA
+S: Universit=E9 de Rennes I
+S: F-35042 Rennes Cedex
+S: France
 
 N: Jon Tombs
 E: jon@gtex02.us.es
@@ -792,7 +1339,9 @@ S: Spain
 
 N: Linus Torvalds
 E: Linus.Torvalds@Helsinki.FI
-D: General kernel hacker
+W: http://www.cs.helsinki.fi/~torvalds/
+P: 1024/A86B35C5 96 54 50 29 EC 11 44 7A  BE 67 3C 24 03 13 62 C8
+D: Original kernel hacker
 S: Kalevankatu 55 B 37
 S: 00180 Helsinki
 S: Finland
@@ -807,6 +1356,21 @@ S: 1 Laurie Court
 S: Kanata, Ontario
 S: CANADA K2L 1S2
 
+N: Andrew Tridgell
+E: Andrew.Tridgell@anu.edu.au
+D: dosemu, networking, samba
+S: 3 Ballow Crescent
+S: MacGregor A.C.T
+S: 2615 Australia
+
+N: Winfried Trümper
+E: truemper@MI.Uni-Koeln.DE
+D: German HOWTO, Enhanced German HOWTO, Crash-Kurs Linux (German)
+D: 1- or 5-days tutorials on Linux twice a year (free of charge)
+D: Linux-Workshop Köln (aka LUUG cologne, germany)
+S: Tacitusstr. 6
+S: D-50968 Köln
+
 N: Theodore Ts'o
 E: tytso@mit.edu
 D: Random Linux hacker
@@ -822,17 +1386,29 @@ S: 1 Amherst Street
 S: Cambridge, Massachusetts 02139
 S: USA
 
+N: Tsu-Sheng Tsao
+E: tsusheng@scf.usc.edu
+D: IGMP(Internet Group Management Protocol) version 2
+S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
+S: Taipei 
+S: Taiwan 112, Republic of China
+S: 24335 Delta Drive
+S: Diamond Bar, California 91765
+S: USA
+
 N: Simmule Turner
-E: simmy@digex.com
+E: sturner@tele-tv.com
 D: Added swapping to filesystem
-S: 8504 16th Street #406
-S: Silver Spring, Maryland 20910
+S: 4226 Landgreen Street
+S: Rockville, Maryland 20853
 S: USA
 
 N: Stephen Tweedie
 E: sct@dcs.ed.ac.uk
+P: 1024/E7A417AD E2 FE A4 20 34 EC ED FC 7D 7E 67 8D E0 31 D1 69
 D: Second extended file system developer
 D: General filesystem hacker
+D: kswap vm management code
 S: Dept. of Computer Science
 S: University of Edinburgh
 S: JCMB, The King's Buildings
@@ -853,6 +1429,10 @@ S: Germany
 N: Jeffrey A. Uphoff
 E: juphoff@nrao.edu
 E: jeff.uphoff@linux.org
+P: 1024/9ED505C5 D7 BB CA AA 10 45 40 1B  16 19 0A C0 38 A0 3E CB
+D: Linux Security/Alert mailing lists' moderator/maintainer.
+D: NSM (rpc.statd) developer.
+D: PAM S/Key module developer.
 D: 'dip' contributor.
 D: AIPS port, astronomical community support.
 S: National Radio Astronomy Observatory
@@ -869,6 +1449,10 @@ S: Schleiermacherstrasse 12
 S: 90491 Nuernberg
 S: Germany
 
+N: Dirk Verworner
+D: Co-author of german book ``Linux-Kernel-Programmierung''
+D: Co-founder of Berlin Linux User Group
+
 N: Patrick Volkerding
 E: volkerdi@ftp.cdrom.com
 D: Produced the Slackware distribution, updated the SVGAlib
@@ -877,6 +1461,15 @@ S: 301 15th Street S.
 S: Moorhead, Minnesota 56560
 S: USA 
 
+N: Jos Vos
+E: jos@xos.nl
+W: http://www.xos.nl/
+D: Various IP firewall updates, ipfwadm
+S: X/OS Experts in Open Systems BV
+S: Kruislaan 419
+S: 1098 VA Amsterdam 
+S: The Netherlands
+
 N: Juergen Weigert
 E: jnweiger@immd4.informatik.uni-erlangen.de
 D: The Linux Support Team Erlangen
@@ -884,14 +1477,36 @@ D: The Linux Support Team Erlangen
 N: Matt Welsh
 E: mdw@sunsite.unc.edu
 D: Linux Documentation Project coordinator
-D: Author, Linux Installation and Getting Started
-D: HOWTO coordinator and writer
-D: Maintainer of sunsite.unc.edu Linux doc archives
-D: Moderator, comp.os.linux.announce
-S: 205 Gray Street NE
-S: Wilson, North Carolina 27893
+D: Author, _Running_Linux_ and I&GS guide
+D: Linuxdoc-SGML formatting system
+D: Keithley DAS1200 device driver
+D: Maintainer of sunsite WWW and FTP, moderator c.o.l.answers
+S: Cornell University Computer Science Department
+S: Robotics and Vision Laboratory
+S: 4130 Upson Hall
+S: Ithaca, New York 14850
+S: USA
+
+N: Greg Wettstein
+E: greg@wind.rmcc.com
+D: Filesystem valid flag for MINIX filesystem.
+D: Minor kernel debugging.
+D: Development and maintenance of sysklogd.
+D: Monitoring of development kernels for long-term stability.
+D: Early implementations of Linux in a commercial environment.
+S: Dr. Greg Wettstein, Ph.D.
+S: Oncology Research Division Computing Facility
+S: Roger Maris Cancer Center
+S: 820 4th St. N.
+S: Fargo, North Dakota  58122
 S: USA
 
+N: Hans-Joachim Widmaier
+E: hjw@zvw.de
+D: AFFS rewrite
+S: Eichenweg 16
+S: 73650 Winterbach
+S: Germany
 
 N: Marco van Wieringen
 E: mvw@mercury.mcs.nl.mugnet.org
@@ -900,14 +1515,6 @@ S: Breeburgsingel 12
 S: 2135 CN Hoofddorp
 S: The Netherlands
 
-N: Stephen D. Williams
-E: sdw@lig.net
-E: sdw@meaddata.com
-D: Consultant, entrepreneur, developer
-S: 2464 Rosina Drive
-S: Dayton, Ohio 45342-6430
-S: USA
-
 N: G\"unter Windau
 E: gunter@mbfys.kun.nl
 D: Some bug fixes in the polling printer driver (lp.c)
@@ -917,7 +1524,7 @@ S: 6525 EZ Nijmegen
 S: The Netherlands
 
 N: Lars Wirzenius
-E: lars.wirzenius@helsinki.fi
+E: liw@iki.fi
 D: Linux System Administrator's Guide
 D: Co-moderator, comp.os.linux.announce
 D: Original sprintf in kernel
@@ -927,8 +1534,8 @@ D: Linux News (electronic magazine)
 D: Meta-FAQ, originator
 D: INFO-SHEET, former maintainer
 D: Author of the longest-living linux bug
-S: Ohratie 16 C 198
-S: sf-01370 Vantaa
+S: Hernesaarenkatu 15 A 2
+S: Fin-00150 Helsinki
 S: Finland
 
 N: Roger E. Wolff
@@ -978,7 +1585,22 @@ S: Germany
 
 N: Leonard N. Zubkoff
 E: lnz@dandelion.com
-D: XFree86 and BusLogic driver additions
+W: http://www.dandelion.com/Linux/
+D: BusLogic SCSI driver
+D: Miscellaneous kernel fixes
 S: 3078 Sulphur Spring Court
 S: San Jose, California 95148
 S: USA
+
+N: Marc Zyngier
+E: maz@gloups.fdn.fr
+D: MD driver
+S: 11 rue Victor HUGO
+S: 95560 Montsoult
+S: France
+
+# Don't add your name here, unless you really _are_ after Marc
+# alphabetically. Leonard used to be very proud of being the 
+# last entry, and he'll get positively pissed if he can't even
+# be second-to-last.  (and this file really _is_ supposed to be
+# in alphabetic order)