2.6.7

diff -Nru a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS   Tue Jun 15 22:20:41 2004
+++ b/MAINTAINERS   Tue Jun 15 22:20:41 2004
@@ -168,10 +168,8 @@
 
 AACRAID SCSI RAID DRIVER
 P:   Adaptec OEM Raid Solutions
-M:   linux-aacraid-devel@dell.com
-L:   linux-aacraid-devel@dell.com
-L:   linux-aacraid-announce@dell.com
-W:   http://domsch.com/linux
+L:   linux-scsi@vger.kernel.org
+W:   http://linux.dell.com/storage.shtml
 S:   Supported
 
 ACPI
@@ -187,6 +185,11 @@
 W:   http://www.tu-darmstadt.de/~tek01/projects/linux.html
 S:   Maintained
 
+ADT746X FAN DRIVER
+P:   Colin Leroy
+M:   colin@colino.net
+S:   Maintained
+
 ADVANSYS SCSI DRIVER
 P:   Bob Frey
 M:   linux@advansys.com
@@ -326,6 +329,12 @@
 W:   http://www.baycom.org/~tom/ham/ham.html
 S:   Maintained
 
+BEFS FILE SYSTEM
+P:   Sergey S. Kostyliov
+M:   rathamahata@php4.ru
+L:   linux-kernel@vger.kernel.org
+S:   Maintained
+
 BERKSHIRE PRODUCTS PC WATCHDOG DRIVER
 P:   Kenji Hollis
 W:   http://ftp.bitgate.com/pcwd/
@@ -350,6 +359,8 @@
 M:   maxk@qualcomm.com
 L:   bluez-devel@lists.sf.net
 W:   http://bluez.sf.net
+W:   http://www.bluez.org
+W:   http://www.holtmann.org/linux/bluetooth/
 S:   Maintained
 
 BLUETOOTH RFCOMM LAYER
@@ -357,7 +368,6 @@
 M:   marcel@holtmann.org
 P:   Maxim Krasnyansky
 M:   maxk@qualcomm.com
-W:   http://bluez.sf.net
 S:   Maintained
 
 BLUETOOTH BNEP LAYER
@@ -365,71 +375,60 @@
 M:   marcel@holtmann.org
 P:   Maxim Krasnyansky
 M:   maxk@qualcomm.com
-W:   http://bluez.sf.net
 S:   Maintained
 
 BLUETOOTH CMTP LAYER
 P:   Marcel Holtmann
 M:   marcel@holtmann.org
-W:   http://www.holtmann.org/linux/bluetooth/
 S:   Maintained
 
-BLUETOOTH HCI USB DRIVER
+BLUETOOTH HCI UART DRIVER
 P:   Marcel Holtmann
 M:   marcel@holtmann.org
 P:   Maxim Krasnyansky
 M:   maxk@qualcomm.com
-W:   http://bluez.sf.net
 S:   Maintained
 
-BLUETOOTH HCI UART DRIVER
+BLUETOOTH HCI USB DRIVER
 P:   Marcel Holtmann
 M:   marcel@holtmann.org
 P:   Maxim Krasnyansky
 M:   maxk@qualcomm.com
-W:   http://bluez.sf.net
 S:   Maintained
 
 BLUETOOTH HCI BCM203X DRIVER
 P:   Marcel Holtmann
 M:   marcel@holtmann.org
-W:   http://www.holtmann.org/linux/bluetooth/
 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
@@ -512,11 +511,6 @@
 L:   linux-computone@lazuli.wittsend.com
 S:   Supported
 
-COMX/MULTIGATE SYNC SERIAL DRIVERS
-P:   Pasztor Szilard
-M:   Pasztor Szilard <don@itc.hu>
-S:   Supported
-
 COSA/SRP SYNC SERIAL DRIVER
 P:   Jan "Yenya" Kasprzak
 M:   kas@fi.muni.cz
@@ -539,11 +533,6 @@
 W:     http://sourceforge.net/projects/cramfs/
 S:     Orphan
 
-CREDITS FILE
-P:   John A. Martin
-M:   jam@acm.org
-S:   Maintained
-
 CRIS PORT
 P:   Bjorn Wesen
 M:   bjornw@axis.com
@@ -574,14 +563,12 @@
 S:   Maintained
 
 CYCLADES ASYNC MUX DRIVER
-P:   Henrique Gobbi
-M:   henrique@cyclades.com
+M:   async@cyclades.com
 W:   http://www.cyclades.com/
 S:   Supported
 
 CYCLADES PC300 DRIVER
-P:   Henrique Gobbi
-M:   henrique@cyclades.com
+M:   pc300@cyclades.com
 W:   http://www.cyclades.com/
 S:   Supported
 
@@ -636,10 +623,9 @@
 S:   Maintained
 
 DEVICE-MAPPER
-P:   Joe Thornber
-M:   dm@uk.sistina.com
-L:   linux-lvm@sistina.com
-W:   http://www.sistina.com/lvm
+P:   Alasdair Kergon
+L:   dm-devel@redhat.com
+W:   http://sources.redhat.com/dm
 S:   Maintained
 
 DEVICE NUMBER REGISTRY
@@ -796,7 +782,7 @@
 P:   James Simmons, Geert Uytterhoeven   
 M:   jsimmons@infradead.org, geert@linux-m68k.org   
 L:   linux-fbdev-devel@lists.sourceforge.net   
-W:   http://www.linux-fbdev.org
+W:   http://linux-fbdev.sourceforge.net/
 S:   Supported
 
 FILE LOCKING (flock() and fcntl()/lockf())
@@ -958,15 +944,15 @@
 IA64 (Itanium) PLATFORM
 P:   David Mosberger-Tang
 M:   davidm@hpl.hp.com
-L:   linux-ia64@linuxia64.org
-W:   http://www.linuxia64.org/
+L:   linux-ia64@vger.kernel.org
+W:   http://www.ia64-linux.org/
 S:   Maintained
 
 SN-IA64 (Itanium) SUB-PLATFORM
 P:   Jesse Barnes
 M:   jbarnes@sgi.com
 L:   linux-altix@sgi.com
-L:   linux-ia64@linuxia64.org
+L:   linux-ia64@vger.kernel.org
 W:   http://www.sgi.com/altix
 S:   Maintained
 
@@ -976,6 +962,11 @@
 W:   http://www.uni-mainz.de/~langm000/linux.html
 S:   Maintained
 
+IBM Power Linux RAID adapter
+P:   Brian King
+M:   brking@us.ibm.com
+S:   Supported
+
 IBM ServeRAID RAID DRIVER
 P:   Jack Hammer
 P:   Dave Jeffery
@@ -1182,8 +1173,8 @@
 S:   Odd Fixes
 
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
-P:   Jeremy Fitzhardinge
-M:   jeremy@goop.org
+P:   Ian Kent
+M:   raven@themaw.net
 L:   autofs@linux.kernel.org
 S:   Maintained
 
@@ -1228,6 +1219,13 @@
 L:   linux-scsi@vger.kernel.org
 S:   Maintained
 
+LEGO USB Tower driver
+P:   Juergen Stuber
+M:   starblue@users.sourceforge.net
+L:   legousb-devel@lists.sourceforge.net
+W:   http://legousb.sourceforge.net/
+S:   Maintained
+
 LINUX FOR IBM pSERIES (RS/6000)
 P:   Paul Mackerras
 M:   paulus@au.ibm.com
@@ -1392,8 +1390,6 @@
 NCP FILESYSTEM
 P:   Petr Vandrovec
 M:   vandrove@vc.cvut.cz
-P:   Volker Lendecke
-M:   vl@kki.org
 L:   linware@sh.cvut.cz
 S:   Maintained
 
@@ -1803,6 +1799,12 @@
 W:   http://www.nsa.gov/selinux
 S:   Supported
 
+SERIAL ATA (SATA) SUBSYSTEM:
+P:   Jeff Garzik
+M:   jgarzik@pobox.com
+L:   linux-ide@vger.kernel.org
+S:   Supported
+
 SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER
 P:   Pat Gefre
 M:   pfg@sgi.com
@@ -2354,7 +2356,7 @@
 
 XFS FILESYSTEM
 P:   Silicon Graphics Inc
-M:   owner-xfs@oss.sgi.com
+M:   xfs-masters@oss.sgi.com
 M:   nathans@sgi.com
 L:   linux-xfs@oss.sgi.com
 W:   http://oss.sgi.com/projects/xfs