Merge with 2.3.27.

1 files changed, 34 insertions, 17 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index eed47b34d..57c707116 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -128,9 +128,10 @@ S:	Maintained
 
 APM DRIVER
 P:	Stephen Rothwell
-M:	Stephen.Rothwell@canb.auug.org.au
+M:	sfr@linuxcare.com
 L:	linux-laptop@vger.rutgers.edu
-S:	Maintained
+W:	http://linuxcare.com.au/apm/
+S:	Supported
 
 APPLETALK NETWORK LAYER
 P:	Jay Schulist
@@ -145,10 +146,9 @@ S:	Maintained
 
 ARM PORT
 P:	Russell King
-M:	linux@arm.uk.linux.org
+M:	linux@arm.linux.org.uk
 L:	linux-arm@vger.rutgers.edu
-L:	arm-linux@tardis.ed.ac.uk
-W:	http://www.arm.uk.linux.org/~rmk/armlinux.html
+W:	http://www.arm.linux.org.uk/~rmk/armlinux.html
 S:	Maintained
 
 ARPD SUPPORT
@@ -176,6 +176,13 @@ M:	kenji@bitgate.com
 W:	http://ftp.bitgate.com/pcwd/
 S:	Maintained
 
+BFS FILE SYSTEM
+P:	Tigran A. Aivazian
+M:	tigran@ocston.org
+L:	linux-kernel@vger.rutgers.edu
+W:	http://www.ocston.org/~tigran/patches/bfs
+S:	Maintained
+
 BUSLOGIC SCSI DRIVER
 P:	Leonard N. Zubkoff
 M:	Leonard N. Zubkoff <lnz@dandelion.com>
@@ -259,7 +266,7 @@ P:	Steven Whitehouse
 M:	SteveW@ACM.org
 W:	http://www.sucs.swan.ac.uk/~rohan/
 W:	http://www-sigproc.eng.cam.ac.uk/~sjw44/
-L:	netdev@roxanne.nuclecu.unam.mx
+L:	netdev@oss.sgi.com
 S:	Maintained
 
 DEVICE NUMBER REGISTRY
@@ -475,17 +482,25 @@ P:	Jaroslav Kysela
 M:	perex@suse.cz
 S:	Maintained
 
-ISDN SUBSYSTEM
+ISDN SUBSYSTEM (general)
 P:	Fritz Elfert
-M:	fritz@wuemaus.franken.de
-L:	isdn4linux@hub-wue.franken.de
+M:	fritz@isdn4linux.de
+L:	isdn4linux@listserv.isdn4linux.de
+W:	http://www.isdn4linux.de
+S:	Maintained
+
+ISDN SUBSYSTEM (card drivers)
+P:	Karsten Keil
+M:	kkeil@suse.de
+L:	isdn4linux@listserv.isdn4linux.de
+W:	http://www.isdn4linux.de
 S:	Maintained
 
 JOYSTICK DRIVER
 P:	Vojtech Pavlik
-M:	vojtech@ucw.cz
+M:	vojtech@suse.cz
 L:	linux-joystick@atrey.karlin.mff.cuni.cz
-W:	http://atrey.karlin.mff.cuni.cz/~vojtech/joystick/
+W:	http://www.suse.cz/development/joystick/
 S:	Maintained
 
 KERNEL AUTOMOUNTER (AUTOFS)
@@ -507,10 +522,10 @@ M:	eis@baty.hanse.de
 L:	linux-x25@vger.rutgers.edu
 S:	Maintained
 
-LINUX FOR POWERPC (PREP)
+LINUX FOR POWERPC
 P:	Cort Dougan
-M:	cort@cs.nmt.edu
-W:	http://linuxppc.cs.nmt.edu/
+M:	cort@ppc.kernel.org
+W:	http://www.ppc.kernel.org/
 S:	Maintained
 
 LINUX FOR POWER MACINTOSH
@@ -609,7 +624,7 @@ S:	Maintained
 
 NETWORKING [GENERAL]
 P:	Networking Teak
-M:	netdev@nuclecu.unam.mx
+M:	netdev@oss.sgi.com
 L:	linux-net@vger.rutgers.edu
 W:	http://www.uk.linux.org/NetNews.html (2.0 only)
 S:	Maintained
@@ -621,7 +636,7 @@ P:	Andi Kleen
 M:	ak@muc.de
 P:	Alexey Kuznetsov
 M:	kuznet@ms2.inr.ac.ru
-L:	netdev@roxanne.nuclecu.unam.mx
+L:	netdev@oss.sgi.com
 S:	Maintained
 
 NFS CLIENT
@@ -757,7 +772,7 @@ S:	Maintained
 SCSI CDROM DRIVER
 P:	Jens Axboe
 M:	axboe@image.dk
-L:	linux-kernel@vger.rutgers.edu
+L:	linux-scsi@vger.rutgers.edu
 W:	http://www.kernel.dk
 S:	Maintained
 
@@ -896,6 +911,8 @@ S:	Maintained
 UDF FILESYSTEM
 P:	Ben Fennema
 M:	bfennema@falcon.csc.calpoly.edu
+P:	Dave Boynton
+M:	dave@trylinux.com
 L:	linux_udf@hootie.lvld.hp.com
 W:	http://www.trylinux.com/projects/udf/index.html
 S:	Maintained