2.6.10

diff -Nru a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS   2004-12-24 13:37:00 -08:00
+++ b/MAINTAINERS   2004-12-24 13:37:00 -08:00
@@ -287,6 +287,12 @@
 M:   linux@treblig.org
 S:   Maintained
 
+ARM/PLEB SUPPORT
+P:   Peter Chubb
+M:   pleb@gelato.unsw.edu.au
+W:   http://www.disy.cse.unsw.edu.au/Hardware/PLEB
+S:   Maintained
+
 ARM/PT DIGITAL BOARD PORT
 P:   Stefan Eletzhofer
 M:   stefan.eletzhofer@eletztrick.de
@@ -531,10 +537,9 @@
 COMPUTONE INTELLIPORT MULTIPORT CARD
 P:   Michael H. Warfield
 M:   Michael H. Warfield <mhw@wittsend.com>
-W:   http://www.computone.com/
 W:   http://www.wittsend.com/computone.html
 L:   linux-computone@lazuli.wittsend.com
-S:   Supported
+S:   Orphaned
 
 COSA/SRP SYNC SERIAL DRIVER
 P:   Jan "Yenya" Kasprzak
@@ -559,8 +564,8 @@
 S:     Orphan
 
 CRIS PORT
-P:   Bjorn Wesen
-M:   bjornw@axis.com
+P:   Mikael Starvik
+M:   starvik@axis.com
 L:   dev-etrax@axis.com
 W:   http://developer.axis.com
 S:   Maintained
@@ -670,7 +675,7 @@
 M:   Eng.Linux@digi.com
 L:   Eng.Linux@digi.com
 W:   http://www.digi.com
-S:   Maintained
+S:   Orphaned
 
 DIGI RIGHTSWITCH NETWORK DRIVER
 P:   Rick Richardson
@@ -683,7 +688,7 @@
 M:   christoph@lameter.com
 W:   http://www.digi.com
 L:   digilnux@digi.com
-S:   Orphaned
+S:   Obsolete
 
 DIRECTORY NOTIFICATION
 P:   Stephen Rothwell
@@ -806,7 +811,7 @@
 
 EXT3 FILE SYSTEM
 P:   Stephen Tweedie, Andrew Morton
-M:   sct@redhat.com, akpm@digeo.com, adilger@clusterfs.com
+M:   sct@redhat.com, akpm@osdl.org, adilger@clusterfs.com
 L:   ext3-users@redhat.com
 S:   Maintained
 
@@ -818,11 +823,11 @@
 S:   Supported
 
 FRAMEBUFFER LAYER
-P:   James Simmons, Geert Uytterhoeven   
-M:   jsimmons@infradead.org, geert@linux-m68k.org   
+P:   Antonino Daplas
+M:   adaplas@pol.net
 L:   linux-fbdev-devel@lists.sourceforge.net   
 W:   http://linux-fbdev.sourceforge.net/
-S:   Supported
+S:   Maintained
 
 FILE LOCKING (flock() and fcntl()/lockf())
 P:   Matthew Wilcox
@@ -832,7 +837,7 @@
 
 FILESYSTEMS (VFS and infrastructure)
 P:   Alexander Viro
-M:   viro@math.psu.edu
+M:   viro@parcelfarce.linux.theplanet.co.uk
 S:   Maintained
 
 FIRMWARE LOADER (request_firmware)
@@ -858,11 +863,9 @@
 S:   Maintained
 
 FTAPE/QIC-117
-P:   Claus-Justus Heine
-M:   claus@momo.math.rwth-aachen.de
 L:   linux-tape@vger.kernel.org
-W:   http://www-math.math.rwth-aachen.de/~LBFM/claus/ftape/
-S:   Maintained
+W:   http://sourceforge.net/projects/ftape
+S:   Orphan
 
 FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 P:   Rik Faith
@@ -947,7 +950,7 @@
 
 HPUSBSCSI
 P:   Oliver Neukum
-M:   drivers@neukum.org
+M:   oliver@neukum.name
 S:   Maintained
 
 I2C AND SENSORS DRIVERS
@@ -1112,8 +1115,8 @@
 M:   john.ronciak@intel.com
 P:   Ganesh Venkatesan
 M:   ganesh.venkatesan@intel.com
-P:   Scott Feldman
-M:   scott.feldman@intel.com
+P:   Jesse Brandeburg
+M:   jesse.brandeburg@intel.com
 W:   http://sourceforge.net/projects/e1000/
 S:   Supported
 
@@ -1250,6 +1253,12 @@
 W:   http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
 S:   Maintained
 
+KERNEL EVENT LAYER (KOBJECT_UEVENT)
+P:   Robert Love
+M:   rml@novell.com
+L:   linux-kernel@vger.kernel.org
+S:   Maintained
+
 LANMEDIA WAN CARD DRIVER
 P:   Andrew Stanley-Jones
 M:   asj@lanmedia.com
@@ -1291,14 +1300,14 @@
 P:   Paul Mackerras
 M:   paulus@samba.org
 W:   http://www.penguinppc.org/
-L:   linuxppc-dev@lists.linuxppc.org
+L:   linuxppc-dev@ozlabs.org
 S:   Supported
 
 LINUX FOR POWER MACINTOSH
 P:   Benjamin Herrenschmidt
 M:   benh@kernel.crashing.org
 W:   http://www.penguinppc.org/
-L:   linuxppc-dev@lists.linuxppc.org
+L:   linuxppc-dev@ozlabs.org
 S:   Maintained
 
 LINUX FOR POWERPC EMBEDDED MPC52XX
@@ -1314,21 +1323,21 @@
 P:   Matt Porter
 M:   mporter@kernel.crashing.org
 W:   http://www.penguinppc.org/
-L:   linuxppc-embedded@lists.linuxppc.org
+L:   linuxppc-embedded@ozlabs.org
 S:   Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC8XX AND BOOT CODE
 P:   Tom Rini
 M:   trini@kernel.crashing.org
 W:   http://www.penguinppc.org/
-L:   linuxppc-embedded@lists.linuxppc.org
+L:   linuxppc-embedded@ozlabs.org
 S:   Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC85XX
 P:     Kumar Gala
 M:     kumar.gala@freescale.com
 W:     http://www.penguinppc.org/
-L:     linuxppc-embedded@lists.linuxppc.org
+L:     linuxppc-embedded@ozlabs.org
 S:     Maintained
 
 LLC (802.2)
@@ -1344,7 +1353,7 @@
 M:   anton@samba.org
 M:   anton@au.ibm.com
 W:   http://linuxppc64.org
-L:   linuxppc64-dev@lists.linuxppc.org
+L:   linuxppc64-dev@ozlabs.org
 S:   Supported
 
 LINUX SECURITY MODULE (LSM) FRAMEWORK
@@ -1437,7 +1446,7 @@
 
 MICROTEK X6 SCANNER
 P:   Oliver Neukum
-M:   drivers@neukum.org
+M:   oliver@neukum.name
 S:   Maintained
 
 MIPS
@@ -1448,11 +1457,8 @@
 S:   Maintained
 
 MISCELLANEOUS MCA-SUPPORT
-P:   David Weinehall
-M:   Project MCA Team <mcalinux@acc.umu.se>
-M:   David Weinehall <tao@acc.umu.se>
-W:   http://www.acc.umu.se/~tao/
-W:   http://www.acc.umu.se/~mcalinux/
+P:   James Bottomley
+M:   jejb@steeleye.com
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
@@ -1529,7 +1535,7 @@
 
 NETWORK DEVICE DRIVERS
 P:   Andrew Morton
-M:   akpm@digeo.com
+M:   akpm@osdl.org
 P:   Jeff Garzik
 M:   jgarzik@pobox.com
 L:   linux-net@vger.kernel.org
@@ -1725,6 +1731,12 @@
 L:   linux-net@vger.kernel.org
 S:   Maintained
 
+PHRAM MTD DRIVER
+P:   Jörn Engel
+M:   joern@wh.fh-wedel.de
+L:   linux-mtd@lists.infradead.org
+S:   Maintained
+
 POSIX CLOCKS and TIMERS
 P:   George Anzinger
 M:   george@mvista.com
@@ -1760,6 +1772,13 @@
 W:   ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
 S:   Supported
 
+PRISM54 WIRELESS DRIVER
+P:   Prism54 Development Team
+M:   prism54-private@prism54.org
+L:   netdev@oss.sgi.com
+W:   http://prism54.org
+S:   Maintained
+
 PROMISE DC4030 CACHING DISK CONTROLLER DRIVER
 P:   Peter Denison
 M:   promise@pnd-pc.demon.co.uk
@@ -2206,8 +2225,8 @@
 S:   Maintained
 
 USB ACM DRIVER
-P:   Vojtech Pavlik
-M:   vojtech@suse.cz
+P:   Oliver Neukum
+M:   oliver@neukum.name
 L:   linux-usb-users@lists.sourceforge.net
 L:   linux-usb-devel@lists.sourceforge.net
 S:   Maintained
@@ -2250,7 +2269,7 @@
 
 USB KAWASAKI LSI DRIVER
 P:   Oliver Neukum
-M:   drivers@neukum.org
+M:   oliver@neukum.name
 L:   linux-usb-users@lists.sourceforge.net
 L:   linux-usb-devel@lists.sourceforge.net
 S:   Maintained
@@ -2332,6 +2351,15 @@
 L:   linux-usb-devel@lists.sourceforge.net
 S:   Maintained
 
+USB SERIAL CYPRESS M8 DRIVER
+P:   Lonnie Mendez
+M:   dignome@gmail.com
+L:   linux-usb-users@lists.sourceforge.net
+L:   linux-usb-devel@lists.sourceforge.net
+S:   Maintained
+W:   http://geocities.com/i0xox0i
+W:   http://firstlight.net/cvs
+
 USB SERIAL CYBERJACK PINPAD/E-COM DRIVER
 L:   linux-usb-users@lists.sourceforge.net
 L:   linux-usb-devel@lists.sourceforge.net
@@ -2367,11 +2395,11 @@
 W:   http://www.connecttech.com
 S:   Supported
 
-USB SN9C10[12] DRIVER
+USB SN9C10x DRIVER
 P:   Luca Risolia
 M:   luca.risolia@studio.unibo.it
 L:   linux-usb-devel@lists.sourceforge.net
-W:   http://go.lamarinapunto.com
+W:   http://www.linux-projects.org
 S:   Maintained
 
 USB SUBSYSTEM
@@ -2399,7 +2427,7 @@
 P:   Luca Risolia
 M:   luca.risolia@studio.unibo.it
 L:   linux-usb-devel@lists.sourceforge.net
-W:   http://go.lamarinapunto.com
+W:   http://www.linux-projects.org
 S:   Maintained
 
 USER-MODE LINUX
@@ -2465,6 +2493,13 @@
 P:   Evgeniy Polyakov
 M:   johnpol@2ka.mipt.ru
 L:   sensors@stimpy.netroedge.com
+S:   Maintained
+
+W83L51xD SD/MMC CARD INTERFACE DRIVER
+P:   Pierre Ossman
+M:   drzeus-wbsd@drzeus.cx
+L:   wbsd-devel@list.drzeus.cx
+W:   http://projects.drzeus.cx/wbsd
 S:   Maintained
 
 W83L785TS HARDWARE MONITOR DRIVER