2.4.3-ac14

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla/MAINTAINERS linux.ac/MAINTAINERS
--- linux.vanilla/MAINTAINERS   Tue Apr  3 17:31:51 2001
+++ linux.ac/MAINTAINERS   Tue Apr 24 20:38:34 2001
@@ -106,6 +106,13 @@
 L:   linux-net@vger.kernel.org
 S:   Maintained
 
+ACI MIXER DRIVER
+P:   Robert Siemer
+M:   Robert.Siemer@gmx.de
+L:   linux-sound@vger.kernel.org
+W:   http://www.uni-karlsruhe.de/~Robert.Siemer/Private/
+S:   Maintained
+
 ACPI
 P:   Andy Grover
 M:   andrew.grover@intel.com
@@ -141,9 +148,9 @@
 
 APM DRIVER
 P:   Stephen Rothwell
-M:   apm@linuxcare.com.au
+M:   sfr@canb.auug.org.au
 L:   linux-laptop@vger.kernel.org
-W:   http://linuxcare.com.au/apm/
+W:   http://www.canb.auug.org.au/~sfr/
 S:   Supported
 
 APPLETALK NETWORK LAYER
@@ -273,8 +280,10 @@
 S:   Maintained
 
 CONFIGURE.HELP
-P:   Axel Boldt
-M:   axel@uni-paderborn.de
+P:   Steven P. Cole
+M:   Steven P. Cole <elenstev@mesatop.com>
+P:   Eric S. Raymond
+M:   Eric S. Raymond <esr@thyrsus.com>
 S:   Maintained
 
 COSA/SRP SYNC SERIAL DRIVER
@@ -293,6 +302,13 @@
 M:   jam@acm.org
 S:   Maintained
 
+CRIS PORT
+P:   Bjorn Wesen
+M:   bjornw@axis.com
+L:   dev-etrax@axis.com
+W:   http://developer.axis.com
+S:   Maintained
+
 CYBERPRO FB DRIVER
 P:   Russell King
 M:   linux@arm.linux.org.uk
@@ -368,7 +384,7 @@
 
 DIRECTORY NOTIFICATION
 P:   Stephen Rothwell
-M:   sfr@linuxcare.com.au
+M:   sfr@canb.auug.org.au
 L:   linux-kernel@vger.kernel.org
 S:   Supported
 
@@ -398,6 +414,12 @@
 L:   dri-devel@lists.sourceforge.net
 S:   Supported
 
+DSCC4 DRIVER
+P:   François Romieu
+M:   romieu@cogenit.fr
+M:   romieu@ensta.fr
+S:   Maintained
+
 EATA-DMA SCSI DRIVER
 P:   Michael Neuffer
 M:   mike@i-Connect.Net
@@ -490,6 +512,12 @@
 W:   http://www.icp-vortex.com/
 S:   Supported
 
+GENERIC HDLC DRIVER, N2 AND C101 DRIVERS
+P:   Krzysztof Halasa
+M:   khc@pm.waw.pl
+W:   http://hq.pm.waw.pl/hdlc/
+S:   Maintained
+
 HAYES ESP SERIAL DRIVER
 P:   Andrew J. Robinson
 M:   arobinso@nyx.net
@@ -517,25 +545,9 @@
 W:   http://www.nt.tuwien.ac.at/~kkudielk/Linux/
 S:   Maintained
 
-KERNEL BUILD (Makefile, Rules.make, scripts/*)
-P:   Keith Owens
-M:   kaos@ocs.com.au
-P:   Michael Elizabeth Chastain
-M:   mec@shout.net
-L:   linux-kbuild@torque.net
-W:   http://www.kernel.org/pub/linux/kernel/projects/kbuild/
-S:   Maintained 
-
-LOGICAL VOLUME MANAGER
-P:     Heinz Mauelshagen
-M:     linux-LVM@EZ-Darmstadt.Telekom.de
-L:     linux-LVM@msede.com
-W:     http://linux.msede.com/lvm
-S:     Maintained 
-
 HIPPI
 P:   Jes Sorensen
-M:   Jes.Sorensen@cern.ch
+M:   jes@linuxcare.com
 L:   linux-hippi@sunsite.auc.dk
 S:   Maintained
 
@@ -600,7 +612,14 @@
 W:   http://www.kernel.dk
 S:   Maintained
 
-IDE/ATAPI TAPE/FLOPPY DRIVERS
+IDE/ATAPI FLOPPY DRIVERS
+P:   Paul Bristow
+M:   Paul Bristow <paul@paulbristow.net>
+W:   http://paulbristow.net/linux/idefloppy.html
+L:   linux-kernel@vger.kernel.org
+S:   Maintained
+
+IDE/ATAPI TAPE DRIVERS
 P:   Gadi Oxman
 M:   Gadi Oxman <gadio@netvision.net.il>
 L:   linux-kernel@vger.kernel.org
@@ -702,6 +721,13 @@
 W:   http://www.developer.axis.com/software/jffs/
 S:   Maintained
 
+JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
+P:   David Woodhouse
+M:   dwmw2@infradead.org
+L:   jffs-dev@axis.com
+W:   http://sources.redhat.com/jffs2/
+S:   Maintained
+
 JOYSTICK DRIVER
 P:   Vojtech Pavlik
 M:   vojtech@suse.cz
@@ -721,6 +747,15 @@
 L:   autofs@linux.kernel.org
 S:   Maintained
 
+KERNEL BUILD (Makefile, Rules.make, scripts/*)
+P:   Keith Owens
+M:   kaos@ocs.com.au
+P:   Michael Elizabeth Chastain
+M:   mec@shout.net
+L:   linux-kbuild@torque.net
+W:   http://www.kernel.org/pub/linux/kernel/projects/kbuild/
+S:   Maintained 
+
 KERNEL NFSD
 P:   Neil Brown
 M:   neilb@cse.unsw.edu.au
@@ -750,14 +785,21 @@
 
 LINUX FOR POWER MACINTOSH
 P:   Paul Mackerras
-M:   paulus@linuxcare.com
+M:   paulus@samba.org
 W:   http://www.linuxppc.org/
 L:   linuxppc-dev@lists.linuxppc.org
 S:   Maintained
 
+LOGICAL VOLUME MANAGER
+P:     Heinz Mauelshagen
+M:     linux-LVM@EZ-Darmstadt.Telekom.de
+L:     linux-LVM@msede.com
+W:     http://linux.msede.com/lvm
+S:     Maintained 
+
 M68K
 P:   Jes Sorensen
-M:   Jes.Sorensen@cern.ch
+M:   jes@linuxcare.com
 W:   http://www.clark.net/pub/lawrencc/linux/index.html
 L:   linux-m68k@lists.linux-m68k.org
 S:   Maintained
@@ -775,7 +817,7 @@
 W:   http://www.tazenda.demon.co.uk/phil/linux-hp
 S:   Maintained
 
-MAESTRO PCI SOUND DRIVER
+MAESTRO PCI SOUND DRIVERS
 P:   Zach Brown
 M:   zab@zabbo.net
 S:   Odd Fixes
@@ -787,6 +829,12 @@
 L:   mtd@infradead.org
 S:   Maintained
 
+MICROTEK X6 SCANNER
+P:      Oliver Neukum
+M:      drivers@neukum.org
+W:      http://fachschaft.cup.uni-muenchen.de/~neukum/scanner.html
+S:      Maintained
+
 MIPS
 P:   Ralf Baechle
 M:   ralf@gnu.ai.mit.edu
@@ -837,10 +885,14 @@
 
 NETFILTER
 P:   Rusty Russell
-M:   rusty@linuxcare.com
+M:   rusty@rustcorp.com.au
 P:   Marc Boucher
 M:   marc@mbsi.ca
-W:   http://www.samba.org/netfilter/
+P:   James Morris
+M:   jamesm@intercode.com.au
+P:   Harald Welte
+M:   laforge@gnumonks.org
+W:   http://netfilter.samba.org
 W:   http://netfilter.kernelnotes.org
 W:   http://netfilter.filewatcher.org
 L:   netfilter@lists.samba.org
@@ -904,8 +956,9 @@
 NTFS FILESYSTEM
 P:   Anton Altaparmakov
 M:   aia21@cus.cam.ac.uk
+L:   linux-ntfs-dev@lists.sourceforge.net
 L:   linux-kernel@vger.kernel.org
-S:   Odd Fixes
+S:   Maintained
 
 NVIDIA (RIVA) FRAMEBUFFER DRIVER
 P:   Ani Joshi
@@ -917,9 +970,9 @@
 P:   Peter De Shrijver
 M:   p2@ace.ulyssis.sutdent.kuleuven.ac.be   
 P:   Mike Phillips
-M:   phillim@amtrak.com
+M:   mikep@linuxtr.net 
 L:   linux-net@vger.kernel.org
-L:   linux-tr@emissary.aus-etc.com
+L:   linux-tr@linuxtr.net
 W:   http://www.linuxtr.net
 S:   Maintained
 
@@ -997,7 +1050,7 @@
 
 PPP PROTOCOL DRIVERS AND COMPRESSORS
 P:   Paul Mackerras
-M:   paulus@linuxcare.com
+M:   paulus@samba.org
 L:   linux-ppp@vger.kernel.org
 S:   Maintained
 
@@ -1037,6 +1090,13 @@
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
+REISERFS FILE SYSTEM
+P:      Hans Reiser
+M:      reiserfs-dev@namesys.com
+L:      reiserfs-list@namesys.com
+W:      http://www.namesys.com
+S:      Supported
+
 ROSE NETWORK LAYER
 P:   Jean-Paul Roubelat
 M:   jpr@f6fbb.org
@@ -1056,6 +1116,14 @@
 W:   www.rtlinux.org
 S:   Maintained
 
+S390
+P:   Martin Schwidefsky
+M:   schwidefsky@de.ibm.com
+M:   linux390@de.ibm.com
+L:   linux-390@vm.marist.edu
+W:   http://oss.software.ibm.com/developerworks/opensource/linux390
+S:   Supported
+
 SA1100 SUPPORT
 P:   Nicolas Pitre
 M:   nico@cam.org
@@ -1174,6 +1242,11 @@
 W:   http://www.stallion.com
 S:   Supported
 
+STARFIRE/DURALAN NETWORK DRIVER
+P:   Ion Badulescu
+M:   ionut@cs.columbia.edu
+S:   Maintained
+
 STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
 W:   http://mosquitonet.Stanford.EDU/strip.html
 S:   Unsupported ?
@@ -1302,6 +1375,13 @@
 S:   Maintained
 W:   http://www.kroah.com/linux-usb/
 
+USB CDC ETHERNET DRIVER
+P:   Brad Hards
+M:   bhards@bigpond.net.au
+L:   linux-usb-users@lists.sourceforge.net
+L:   linux-usb-devel@lists.sourceforge.net
+S:   Maintained
+
 USB HID/HIDBP/INPUT DRIVERS
 P:   Vojtech Pavlik
 M:   vojtech@suse.cz
@@ -1318,6 +1398,13 @@
 L:   linux-usb-devel@lists.sourceforge.net
 S:   Maintained
 
+USB KAWASAKI LSI DRIVER
+P:   Brad Hards
+M:   bhards@bigpond.net.au
+L:   linux-usb-users@lists.sourceforge.net
+L:   linux-usb-devel@lists.sourceforge.net
+S:   Maintained
+
 USB OHCI DRIVER
 P:   Roman Weissgaerber
 M:   weissg@vienna.at
@@ -1357,11 +1444,11 @@
 
 USB SERIAL KEYSPAN DRIVER
 P:   Hugh Blemings
-M:   hugh@linuxcare.com
+M:   hugh@misc.nu
 L:   linux-usb-users@lists.sourceforge.net
 L:   linux-usb-devel@lists.sourceforge.net
 S:   Maintained
-W:   http://www.linuxcare.com.au/hugh/keyspan.html
+W:   http://misc.nu/hugh/keyspan/
 
 USB SERIAL DRIVER
 P:   Greg Kroah-Hartman
@@ -1401,6 +1488,14 @@
 L:   linux-usb-devel@lists.sourceforge.net
 W:   http://usb.in.tum.de
 S:   Maintained
+
+USER-MODE PORT
+P:   Jeff Dike
+M:   jdike@karaya.com
+L:   user-mode-linux-devel@lists.sourceforge.net
+L:   user-mode-linux-user@lists.sourceforge.net
+W:   http://user-mode-linux.sourceforge.net
+S:   Maintained
    
 VFAT FILESYSTEM:
 P:   Gordon Chaffee
@@ -1423,6 +1518,12 @@
 W:   http://rio500.sourceforge.net
 S:   Maintained
 
+VERITAS FILESYSTEM
+P:   Christoph Hellwig
+M:   hch@caldera.de
+W:   ftp://ftp.openlinux.org/pub/people/hch/vxfs
+S:   Maintained
+
 VIDEO FOR LINUX
 P:   Alan Cox
 M:   Alan.Cox@linux.org
@@ -1430,8 +1531,8 @@
 S:   Maintained for 2.2 only
 
 WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC)
-P:     Jaspreet Singh
-M:     jaspreet@sangoma.com
+P:     Nenad Corbic
+M:     ncorbic@sangoma.com
 M:     dm@sangoma.com
 W:     http://www.sangoma.com
 S:     Supported
@@ -1457,6 +1558,12 @@
 X86 3-LEVEL PAGING (PAE) SUPPORT
 P:   Ingo Molnar
 M:   mingo@redhat.com
+S:   Maintained
+
+YAM DRIVER FOR AX.25
+P:   Jean-Paul Roubelat
+M:   jpr@f6fbb.org
+L:   linux-hams@vger.kernel.org
 S:   Maintained
 
 Z85230 SYNCHRONOUS DRIVER