2.4.12-ac6

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla/MAINTAINERS linux.ac/MAINTAINERS
--- linux.vanilla/MAINTAINERS   Thu Oct 11 13:52:06 2001
+++ linux.ac/MAINTAINERS   Tue Oct 23 09:09:15 2001
@@ -196,6 +196,12 @@
 M:   linux@treblig.org
 S:   Maintained
 
+ARM/SHARK MACHINE SUPPORT
+P:   Alexander Schulz
+M:   alex@shark-linux.de
+W:   http://www.shark-linux.de/shark.html
+S:   Maintained
+
 ARM/STRONGARM110 PORT
 P:   Russell King
 M:   rmk@arm.linux.org.uk
@@ -642,6 +648,13 @@
 L:   Linux-Kernel@vger.kernel.org
 S:   Maintained
 
+i386 SETUP CODE / CPU ERRATA WORKAROUNDS
+P:   Dave Jones
+M:   davej@suse.de
+P:   H. Peter Anvin
+M:   hpa@zytor.com
+S:   Maintained
+
 i810 TCO TIMER WATCHDOG
 P:   Nils Faerber
 M:   nils@kernelconcepts.de
@@ -748,6 +761,13 @@
 M:   tigran@veritas.com
 S:   Maintained
 
+INTERMEZZO FILE SYSTEM
+P:   Peter J. Braam
+M:      braam@clusterfs.com
+W:      http://www.inter-mezzo.org/
+L:      intermezzo-discuss@lists.sourceforge.net
+S:      Maintained
+
 IP MASQUERADING:
 P:   Juanjo Ciarlante
 M:   jjciarla@raiz.uncu.edu.ar
@@ -875,6 +895,13 @@
 L:   linuxppc-dev@lists.linuxppc.org
 S:   Maintained
 
+LINUX FOR 64BIT POWERPC
+P:   David Engebretsen
+M:   engebret@us.ibm.com
+W:   http://linuxppc64.org
+L:   linuxppc64-dev@lists.linuxppc.org
+S:   Supported
+
 LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP Dynamic Disks)
 P:   Richard Russon (FlatCap)
 M:   ldm@flatcap.org
@@ -1053,6 +1080,12 @@
 L:     linux-net@vger.kernel.org
 S:     Maintained
 
+NINJA SCSI-3 / NINJA SCSI-32Bi PCMCIA SCSI HOST ADAPTER DRIVER
+P:   YOKOTA Hiroshi
+M:   yokota@netlab.is.tsukuba.ac.jp
+W:   http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
+S:   Maintained
+
 NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility)
 P:   Eberhard Moenkeberg
 M:   emoenke@gwdg.de
@@ -1160,6 +1193,11 @@
 L:   linux-ppp@vger.kernel.org
 S:   Maintained
 
+PPP OVER ATM (RFC 2364)
+P:   Mitchell Blank Jr
+M:   mitch@sfgoth.com
+S:   Maintained
+
 PPP OVER ETHERNET
 P:   Michal Ostrowski
 M:   mostrows@styx.uwaterloo.ca
@@ -1399,6 +1437,13 @@
 W:   http://www.linuxtr.net
 S:   Maintained
 
+TOSHIBA SMM DRIVER
+P:   Jonathan Buzzard
+M:   jonathan@buzzard.org.uk
+L:   tlinux-users@tce.toshiba-dme.co.jp
+W:   http://www.buzzard.org.uk/toshiba/
+S:   Maintained
+
 TRIDENT 4DWAVE/SIS 7018 PCI AUDIO CORE
 P:      Ollie Lho  
 M:      ollie@sis.com.tw
@@ -1604,6 +1649,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
@@ -1662,11 +1715,24 @@
 M:   mingo@redhat.com
 S:   Maintained
 
+X86-64 port
+P:   Andi Kleen
+M:   ak@suse.de
+L:   discuss@x86-64.org
+W:   http://www.x86-64.org
+S:   Maintained
+
 YAM DRIVER FOR AX.25
 P:   Jean-Paul Roubelat
 M:   jpr@f6fbb.org
 L:   linux-hams@vger.kernel.org
 S:   Maintained
+
+YMFPCI YAMAHA PCI SOUND
+P:     Pete Zaitcev
+M:     zaitcev@yahoo.com
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
 
 Z85230 SYNCHRONOUS DRIVER
 P:   Alan Cox