2.4.22-rc4

diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.21/MAINTAINERS linux-2.4.22-rc4/MAINTAINERS
--- linux-2.4.21/MAINTAINERS   2003-06-13 14:51:29.000000000 +0000
+++ linux-2.4.22-rc4/MAINTAINERS   2003-08-24 21:54:02.000000000 +0000
@@ -78,12 +78,6 @@
 W:   http://www.linuxtr.net
 S:   Maintained
 
-3C501 NETWORK DRIVER
-P:   Alan Cox
-M:   alan@lxorguk.ukuu.org.uk
-L:   linux-net@vger.kernel.org
-S:   Maintained for 2.2 only
-
 3C505 NETWORK DRIVER
 P:   Philip Blundell
 M:   Philip.Blundell@pobox.com
@@ -206,6 +200,21 @@
 L:   linux-scsi@vger.kernel.org
 S:   Maintained
 
+ALCATEL SPEEDTOUCH USB DRIVER
+P:   Duncan Sands
+M:   duncan.sands@wanadoo.fr
+L:   linux-usb-users@lists.sourceforge.net
+L:   linux-usb-devel@lists.sourceforge.net
+W:   http://www.linux-usb.org/SpeedTouch/
+S:   Maintained
+
+AIPTEK USB TABLET DRIVER
+P:   Bryan W. Headley
+M:   Bryan W. Headley <bwheadley@earthlink.net>
+W:   http://aiptektablet.sourceforge.net
+L:   aiptektablet-users@sourceforge.net
+S:   Maintained
+
 ALTERA EPXA1/EPXA10 DEVELOPMENT BOARD PORT
 P:   Clive Davies
 M:   cdavies@altera.com
@@ -302,18 +311,78 @@
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
-BLUETOOTH SUBSYSTEM (BlueZ)
+BLUETOOTH SUBSYSTEM
+P:   Maxim Krasnyansky
+M:   maxk@qualcomm.com
+W:   http://bluez.sf.net
+S:   Maintained
+
+BLUETOOTH RFCOMM LAYER
+P:   Maxim Krasnyansky
+M:   maxk@qualcomm.com
+W:   http://bluez.sf.net
+S:   Maintained
+
+BLUETOOTH BNEP LAYER
 P:   Maxim Krasnyansky
 M:   maxk@qualcomm.com
 W:   http://bluez.sf.net
 S:   Maintained
 
-BLUETOOTH SUBSYSTEM (PC Card Drivers)
+BLUETOOTH CMTP LAYER
+P:   Marcel Holtmann
+M:   marcel@holtmann.org
+W:   http://www.holtmann.org/linux/bluetooth/
+S:   Maintained
+
+BLUETOOTH HCI USB DRIVER
+P:   Maxim Krasnyansky
+M:   maxk@qualcomm.com
+W:   http://bluez.sf.net
+S:   Maintained
+
+BLUETOOTH HCI UART DRIVER
+P:   Maxim Krasnyansky
+M:   maxk@qualcomm.com
+W:   http://bluez.sf.net
+S:   Maintained
+
+BLUETOOTH HCI BFUSB DRIVER
+P:   Marcel Holtmann
+M:   marcel@holtmann.org
+W:   http://www.holtmann.org/linux/bluetooth/
+S:   Maintained
+
+BLUETOOTH HCI DTL1 DRIVER
+P:   Marcel Holtmann
+M:   marcel@holtmann.org
+W:   http://www.holtmann.org/linux/bluetooth/
+S:   Maintained
+
+BLUETOOTH HCI BLUECARD DRIVER
+P:   Marcel Holtmann
+M:   marcel@holtmann.org
+W:   http://www.holtmann.org/linux/bluetooth/
+S:   Maintained
+
+BLUETOOTH HCI BT3C DRIVER
+P:   Marcel Holtmann
+M:   marcel@holtmann.org
+W:   http://www.holtmann.org/linux/bluetooth/
+S:   Maintained
+
+BLUETOOTH HCI BTUART DRIVER
 P:   Marcel Holtmann
 M:   marcel@holtmann.org
 W:   http://www.holtmann.org/linux/bluetooth/
 S:   Maintained
 
+BLUETOOTH HCI VHCI DRIVER
+P:   Maxim Krasnyansky
+M:   maxk@qualcomm.com
+W:   http://bluez.sf.net
+S:   Maintained
+
 BONDING DRIVER
 P:   Chad Tindel
 M:   ctindel@users.sourceforge.net
@@ -381,8 +450,8 @@
 S:     Supported
 
 COMX/MULTIGATE SYNC SERIAL DRIVERS
-P:   Gergely Madarasz
-M:   Gergely Madarasz <gorgo@itc.hu>
+P:   Pasztor Szilard
+M:   Pasztor Szilard <don@itc.hu>
 S:   Supported
 
 CONFIGURE, MENUCONFIG, XCONFIG
@@ -430,6 +499,15 @@
 W:   http://developer.axis.com
 S:   Maintained
 
+CRYPTO API
+P:   James Morris
+M:   jmorris@intercode.com.au
+P:   David S. Miller
+M:   davem@redhat.com
+W   http://samba.org/~jamesm/crypto/
+L:   linux-kernel@vger.kernel.org
+S:   Maintained
+
 CYBERPRO FB DRIVER
 P:   Russell King
 M:   rmk@arm.linux.org.uk
@@ -676,8 +754,8 @@
 S:   Maintained
 
 HFS FILESYSTEM
-P:      Oliver Neukum
-M:      oliver@neukum.org
+P:      Roman Zippel
+P:      zippel@linux-m68k.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
@@ -825,7 +903,7 @@
 
 IMS TWINTURBO FRAMEBUFFER DRIVER
 P:   Paul Mundt
-M:   lethal@chaoticdreams.org
+M:   lethal@linux-sh.org
 L:   linux-fbdev-devel@lists.sourceforge.net
 S:   Maintained
 
@@ -1183,6 +1261,8 @@
 M:   pekkas@netcore.fi
 P:   James Morris
 M:   jmorris@intercode.com.au
+P:   Hideaki YOSHIFUJI
+M:   yoshfuji@linux-ipv6.org
 L:   netdev@oss.sgi.com
 S:   Maintained
 
@@ -1364,9 +1444,9 @@
 P:   M. R. Brown
 M:   mrbrown@0xd6.org
 P:   Paul Mundt
-M:   lethal@0xd6.org
+M:   lethal@linux-sh.org
 L:   linux-fbdev-devel@lists.sourceforge.net
-W:   http://www.linuxdc.org
+L:   linuxsh-dev@lists.sourceforge.net
 S:   Maintained
 
 PPP PROTOCOL DRIVERS AND COMPRESSORS
@@ -1400,13 +1480,13 @@
 
 RADEON FRAMEBUFFER DISPLAY DRIVER
 P:   Ani Joshi
-M:   ajoshi@shell.unixbox.com
+M:   ajoshi@kernel.crashing.org
 L:      linux-fbdev-devel@lists.sourceforge.net
 S:      Maintained
 
 RAGE128 FRAMEBUFFER DISPLAY DRIVER
 P:   Ani Joshi
-M:   ajoshi@shell.unixbox.com
+M:   ajoshi@kernel.crashing.org
 L:   linux-fbdev-devel@lists.sourceforge.net
 S:   Maintained
 
@@ -1499,7 +1579,7 @@
 
 SCSI TAPE DRIVER
 P:   Kai Mäkisara
-M:   Kai.Makisara@metla.fi
+M:   Kai.Makisara@kolumbus.fi
 L:   linux-scsi@vger.kernel.org
 S:   Maintained
 
@@ -1569,11 +1649,6 @@
 W:   http://popies.net/sonypi/
 S:   Maintained
 
-SOUND
-P:   Alan Cox
-M:   alan@redhat.com
-S:   Maintained for 2.2 only
-
 UltraSPARC (sparc64):
 P:   David S. Miller
 M:   davem@redhat.com
@@ -1631,19 +1706,35 @@
 W:   http://www.stradis.com/
 S:   Maintained
 
-SUPERH
+SUPERH (sh)
+P:   Paul Mundt
+M:   lethal@linux-sh.org
 P:   Niibe Yutaka
 M:   gniibe@m17n.org
 P:   Kazumoto Kojima
 M:   kkojima@rr.iij4u.or.jp
+L:   linuxsh-dev@lists.sourceforge.net
 L:   linux-sh@m17n.org
+W:   http://www.linux-sh.org
 W:   http://www.m17n.org/linux-sh/
 W:   http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html
 S:   Maintained
 
+SUPERH64 (sh64)
+P:   Paul Mundt
+M:   lethal@linux-sh.org
+P:   Richard Curnow
+M:   richard.curnow@superh.com
+P:   Benedict Gaster
+M:   benedict.gaster@superh.com
+L:   linuxsh-shmedia-dev@lists.sourceforge.net
+W:   http://www.linux-sh.org
+W:   http://linux-shmedia.bkbits.net
+S:   Maintained
+
 SUPERH WATCHDOG
 P:   Paul Mundt
-M:   lethal@0xd6.org
+M:   lethal@linux-sh.org
 L:   linuxsh-dev@lists.sourceforge.net
 W:   http://www.linuxsh.org
 S:   Maintained
@@ -1706,6 +1797,12 @@
 W:   http://www.linuxtr.net
 S:   Maintained
 
+TOSHIBA ACPI EXTRAS DRIVER
+P:   John Belmonte
+M:   toshiba_acpi@memebeam.org
+W:   http://memebeam.org/toys/ToshibaAcpiDriver
+S:   Maintained
+
 TOSHIBA SMM DRIVER
 P:   Jonathan Buzzard
 M:   jonathan@buzzard.org.uk
@@ -1783,7 +1880,7 @@
 L:   linux-usb-devel@lists.sourceforge.net
 S:   Maintained
 
-USB BLUETOOTH DRIVER
+USB BLUETOOTH TTY CONVERTER DRIVER
 P:   Greg Kroah-Hartman
 M:   greg@kroah.com
 L:   linux-usb-users@lists.sourceforge.net
@@ -2032,12 +2129,6 @@
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
-Z85230 SYNCHRONOUS DRIVER
-P:   Alan Cox
-M:   alan@redhat.com
-W:   http://roadrunner.swansea.linux.org.uk/synchronous.shtml
-S:   Maintained for 2.2 only
-
 Z8530 DRIVER FOR AX.25
 P:   Joerg Reuter
 M:   jreuter@yaina.de