2.6.2

diff -Nru a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS   Tue Feb  3 19:45:30 2004
+++ b/MAINTAINERS   Tue Feb  3 19:45:30 2004
@@ -338,35 +338,64 @@
 S:   Maintained
 
 BLUETOOTH SUBSYSTEM
+P:   Marcel Holtmann
+M:   marcel@holtmann.org
 P:   Maxim Krasnyansky
 M:   maxk@qualcomm.com
+L:   bluez-devel@lists.sf.net
 W:   http://bluez.sf.net
 S:   Maintained
 
 BLUETOOTH RFCOMM LAYER
+P:   Marcel Holtmann
+M:   marcel@holtmann.org
 P:   Maxim Krasnyansky
 M:   maxk@qualcomm.com
 W:   http://bluez.sf.net
 S:   Maintained
 
 BLUETOOTH BNEP LAYER
+P:   Marcel Holtmann
+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
+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
+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
@@ -608,8 +637,8 @@
 S:   Maintained
 
 DEVICE NUMBER REGISTRY
-P:   H. Peter Anvin
-M:   hpa@zytor.com
+P:   John Cagle
+M:   device@lanana.org
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
@@ -680,7 +709,8 @@
 
 DVB SUBSYSTEM AND DRIVERS
 P:   LinuxTV.org Project
-L:    linux-dvb@linuxtv.org
+M:    linux-dvb-maintainer@linuxtv.org
+L:    linux-dvb@linuxtv.org (subscription required)
 W:   http://linuxtv.org/developer/dvb.xml
 S:   Supported
 
@@ -1135,7 +1165,7 @@
 P:   H. Peter Anvin
 M:   hpa@zytor.com
 L:   autofs@linux.kernel.org
-S:   Maintained
+S:   Odd Fixes
 
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 P:   Jeremy Fitzhardinge
@@ -1143,11 +1173,11 @@
 L:   autofs@linux.kernel.org
 S:   Maintained
 
-KERNEL BUILD (Makefile, Rules.make, scripts/*)
-P:   Michael Elizabeth Chastain
-M:   mec@shout.net
-L:   kbuild-devel@lists.sourceforge.net
-W:   http://kbuild.sourceforge.net
+KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)
+P:   Kai Germaschewski
+M:   kai@germaschewski.name
+P:   Sam Ravnborg
+M:   sam@ravnborg.org
 S:   Maintained 
 
 KERNEL JANITORS
@@ -1482,8 +1512,8 @@
 S:   Maintained
 
 OPROFILE
-P:   John Levon
-M:   levon@movementarian.org
+P:   Philippe Elie
+M:   phil.el@wanadoo.fr
 L:   oprofile-list@lists.sf.net
 S:   Maintained
 
@@ -2223,7 +2253,7 @@
 
 USB W996[87]CF DRIVER
 P:   Luca Risolia
-M:   luca_ing@libero.it
+M:   luca.risolia@studio.unibo.it
 L:   linux-usb-devel@lists.sourceforge.net
 W:   http://go.lamarinapunto.com
 S:   Maintained