Merge with Linux 2.2.1.

1 files changed, 78 insertions, 26 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index bafcd3165..6030898f5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -94,9 +94,12 @@ L:	linux-net@vger.rutgers.edu
 S:	Maintained
 W:	http://rsphy1.anu.edu.au/~gpg109/ne2000.html
 
-AEDSP16 DRIVER
-P:	Riccardo Facchetti
-M:	fizban@tin.it
+AD1816 SOUND DRIVER
+P:	Thorsten Knabe
+M:	Thorsten Knabe <tek@rbg.informatik.tu-darmstadt.de>
+M:	Thorsten Knabe <tek01@hrzpub.tu-darmstadt.de>
+W:	http://www.student.informatik.tu-darmstadt.de/~tek/projects/linux.html
+W:	http://www.tu-darmstadt.de/~tek01/projects/linux.html
 S:	Maintained
 
 ADVANSYS SCSI DRIVER
@@ -105,6 +108,11 @@ M:	Bob Frey <bobf@advansys.com>
 W:	http://www.advansys.com/linux
 S:	Maintained
 
+AEDSP16 DRIVER
+P:	Riccardo Facchetti
+M:	fizban@tin.it
+S:	Maintained
+
 AHA152X SCSI DRIVER
 P:	Juergen E. Fischer
 M:	Juergen Fischer <fischer@et-inf.fho-emden.de>
@@ -162,19 +170,31 @@ L:	linux-scsi@vger.rutgers.edu
 W:	http://www.dandelion.com/Linux/
 S:	Maintained
 
+CONFIGURE, MENUCONFIG, XCONFIG
+P:	Michael Elizabeth Chastain
+M:	mec@shout.net
+L:	linux-kbuild@torque.net
+S:	Maintained
+
 CONFIGURE.HELP
 P:	Axel Boldt
 M:	boldt@math.ucsb.edu
 S:	Maintained
 
+COSA/SRP SYNC SERIAL DRIVER
+P:	Jan "Yenya" Kasprzak
+M:	kas@fi.muni.cz
+W:	http://www.fi.muni.cz/~kas/cosa/
+S:	Maintained
+
 CREDITS FILE
 P:	John A. Martin
 M:	jam@acm.org
 S:	Maintained
 
 CYCLADES ASYNC MUX DRIVER
-P:	Marcio Saito
-M:	Marcio Saito <marcio@cyclades.com>
+P:	Ivan Passos
+M:	Ivan Passos <ivan@cyclades.com>
 W:	http://www.cyclades.com/
 S:	Supported
 
@@ -188,13 +208,15 @@ S:	Maintained
 
 DC390/AM53C974 SCSI driver
 P:	Kurt Garloff
-M:	K.Garloff@ping.de
-W:	ftp://student.physik.uni-dortmund.de/pub/linux/kernel/dc390/
+M:	kurt@garloff.de
+W:	http://www.garloff.de/kurt/linux/dc390/
 S:	Maintained
 
 DECnet NETWORK LAYER
 P:	Steven Whitehouse
 M:	SteveW@ACM.org
+W:	http://www.sucs.swan.ac.uk/~rohan/
+W:	http://www-sigproc.eng.cam.ac.uk/~sjw44/
 L:	netdev@roxanne.nuclecu.unam.mx
 S:	Maintained
 
@@ -327,17 +349,21 @@ P:	Jaroslav Kysela
 M:	perex@jcu.cz
 S:	Maintained
 
+IBM MCA SCSI SUBSYSTEM DRIVER
+P:	Michael Lang
+M:	langa2@kph.uni-mainz.de
+W:	http://www.uni-mainz.de/~langm000/linux.html
+S:	Maintained
+
 IDE DRIVER [GENERAL]
-P:	Mark Lord
-M:	mlord@pobox.com
+P:	Andre Hedrick
+M:	hedrick@astro.dyer.vanderbilt.edu
 L:	linux-kernel@vger.rutgers.edu
-S:	Odd Fixes
+S:	Maintained
 
 IDE/ATAPI CDROM DRIVER 
 P:	Jens Axboe
 M:	axboe@image.dk
-P:	Chris Zwilling
-M:	chris@cloudnet.com
 L:	linux-kernel@vger.rutgers.edu
 S:	Maintained
 
@@ -350,7 +376,7 @@ S:	Maintained
 IP FIREWALL
 P:	Paul Russell
 M:	Paul.Russell@rustcorp.com.au
-W:	http://www.adelaide.net.au/~rustcorp/ipfwchains/ipfwchains.html
+W:	http://www.rustcorp.com/linux/ipchains
 S:	Supported
 
 IPX/SPX NETWORK LAYER
@@ -359,6 +385,13 @@ M:	Jay Schulist <Jay.Schulist@spacs.k12.wi.us>
 L:	linux-net@vger.rutgers.edu
 S:	Maintained
 
+IRDA SUBSYSTEM
+P:      Dag Brattli
+M:      Dag Brattli <dagb@cs.uit.no>
+L:      linux-irda@list.uit.no
+W:      http://www.cs.uit.no/~dagb/irda/
+S:      Maintained
+
 ISDN SUBSYSTEM
 P:	Fritz Elfert
 M:	fritz@wuemaus.franken.de
@@ -378,6 +411,13 @@ M:	hpa@zytor.com
 L:	autofs@linux.kernel.org
 S:	Maintained
 
+KERNEL NFSD
+P:	G. Allen Morris III
+M:	gam3@acm.org
+L:	nfs-devel@linux.kernel.org (Linux NFS)
+W:	http://csua.berkeley.edu/~gam3/knfsd
+S:	Maintained
+
 LAPB module
 P:	Henner Eisen
 M:	eis@baty.hanse.de
@@ -416,12 +456,6 @@ M:	philb@gnu.org
 W:	http://www.tazenda.demon.co.uk/phil/linux-hp
 S:	Maintained
 
-MENUCONFIG
-P:	Michael Elizabeth Chastain
-M:	mec@shout.net
-L:	linux-kernel@vger.rutgers.edu
-S:	Maintained
-
 MIPS
 P:	Ralf Baechle
 M:	ralf@gnu.ai.mit.edu
@@ -448,6 +482,13 @@ M:	rubini@ipvvis.unipv.it
 L:	linux-kernel@vger.rutgers.edu
 S:	Maintained
 
+MTRR AND SIMILAR SUPPORT [i386]
+P:	Richard Gooch
+M:	rgooch@atnf.csiro.au
+L:	linux-kernel@vger.rutgers.edu
+W:	http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
+S:	Maintained
+
 MULTISOUND SOUND DRIVER
 P:	Andrew Veliath
 M:	andrewtv@usa.net
@@ -457,7 +498,7 @@ NCP FILESYSTEM
 P:	Petr Vandrovec
 M:	vandrove@vc.cvut.cz
 P:	Volker Lendecke
-M:	lendecke@Math.Uni-Goettingen.de
+M:	vl@kki.org
 L:	linware@sh.cvut.cz
 S:	Maintained
 
@@ -481,9 +522,9 @@ S:	Maintained
 
 NETWORKING [IPv4/IPv6]
 P:	David S. Miller
-M:	davem@caip.rutgers.edu
-P:	Eric Schenk
-M:	Eric.Schenk@dna.lth.se
+M:	davem@dm.cobaltmicro.com
+P:	Andi Kleen
+M:	ak@muc.de
 P:	Alexey Kuznetsov
 M:	kuznet@ms2.inr.ac.ru
 L:	netdev@roxanne.nuclecu.unam.mx
@@ -502,6 +543,12 @@ M:	emoenke@gwdg.de
 L:	linux-kernel@vger.rutgers.edu
 S:	Maintained
 
+OPL3-SA2, SA3, and SAx DRIVER
+P:	Scott Murray
+M:	scottm@interlog.com
+L:	linux-sound@vger.rutgers.edu
+S:	Maintained
+
 PARALLEL PORT SUPPORT
 P:	Phil Blundell
 M:	Philip.Blundell@pobox.com
@@ -594,9 +641,16 @@ M:	Kai.Makisara@metla.fi
 L:	linux-scsi@vger.rutgers.edu
 S:	Maintained
 
+SGI VISUAL WORKSTATION 320 AND 540
+P:	Bent Hagemark
+M:	bh@sgi.com
+P:	Ingo Molnar
+M:	mingo@redhat.com
+S:	Maintained
+
 SMB FILESYSTEM
 P:	Volker Lendecke
-M:	lendecke@Math.Uni-Goettingen.de
+M:	vl@kki.org
 L:	samba@listproc.anu.edu.au
 S:	Maintained
 
@@ -688,8 +742,6 @@ S:	Maintained
 UNIFORM CDROM DRIVER 
 P:	Jens Axboe
 M:	axboe@image.dk
-P:	Chris Zwilling
-M:	chris@cloudnet.com
 L:	linux-kernel@vger.rutgers.edu
 S:	Maintained