[Bluetooth] Consolidate maintainers information

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 41d7a1e..2676f9a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -936,94 +936,19 @@ M:        joern@lazybastard.org
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
 
-BLUETOOTH SUBSYSTEM
+BLUETOOTH DRIVERS
 P:     Marcel Holtmann
 M:     marcel@holtmann.org
-P:     Maxim Krasnyansky
-M:     maxk@qualcomm.com
 L:     linux-bluetooth@vger.kernel.org
-W:     http://bluez.sf.net
-W:     http://www.bluez.org
-W:     http://www.holtmann.org/linux/bluetooth/
-T:     git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
-S:     Maintained
-
-BLUETOOTH RFCOMM LAYER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-P:     Maxim Krasnyansky
-M:     maxk@qualcomm.com
+W:     http://www.bluez.org/
 S:     Maintained
 
-BLUETOOTH BNEP LAYER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-P:     Maxim Krasnyansky
-M:     maxk@qualcomm.com
-S:     Maintained
-
-BLUETOOTH CMTP LAYER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-S:     Maintained
-
-BLUETOOTH HIDP LAYER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-S:     Maintained
-
-BLUETOOTH HCI UART DRIVER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-P:     Maxim Krasnyansky
-M:     maxk@qualcomm.com
-S:     Maintained
-
-BLUETOOTH HCI USB DRIVER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-P:     Maxim Krasnyansky
-M:     maxk@qualcomm.com
-S:     Maintained
-
-BLUETOOTH HCI BCM203X DRIVER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-S:     Maintained
-
-BLUETOOTH HCI BPA10X DRIVER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-S:     Maintained
-
-BLUETOOTH HCI BFUSB DRIVER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-S:     Maintained
-
-BLUETOOTH HCI DTL1 DRIVER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-S:     Maintained
-
-BLUETOOTH HCI BLUECARD DRIVER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-S:     Maintained
-
-BLUETOOTH HCI BT3C DRIVER
-P:     Marcel Holtmann
-M:     marcel@holtmann.org
-S:     Maintained
-
-BLUETOOTH HCI BTUART DRIVER
+BLUETOOTH SUBSYSTEM
 P:     Marcel Holtmann
 M:     marcel@holtmann.org
-S:     Maintained
-
-BLUETOOTH HCI VHCI DRIVER
-P:     Maxim Krasnyansky
-M:     maxk@qualcomm.com
+L:     linux-bluetooth@vger.kernel.org
+W:     http://www.bluez.org/
+T:     git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
 S:     Maintained
 
 BONDING DRIVER
@@ -2462,7 +2387,7 @@ L:        kernel-janitors@vger.kernel.org
 W:     http://www.kerneljanitors.org/
 S:     Maintained
 
-KERNEL NFSD
+KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 P:     J. Bruce Fields
 M:     bfields@fieldses.org
 P:     Neil Brown
@@ -3078,7 +3003,7 @@ M:        ja@ssi.bg
 L:     netdev@vger.kernel.org
 S:     Maintained
 
-NFS CLIENT
+NFS, SUNRPC, AND LOCKD CLIENTS
 P:     Trond Myklebust
 M:     Trond.Myklebust@netapp.com
 L:     linux-nfs@vger.kernel.org
@@ -4683,12 +4608,6 @@ L:       linux-wireless@vger.kernel.org
 L:     zd1211-devs@lists.sourceforge.net (subscribers-only)
 S:     Maintained
 
-ZF MACHZ WATCHDOG
-P:     Fernando Fuganti
-M:     fuganti@netbank.com.br
-W:     http://cvs.conectiva.com.br/drivers/ZFL-watchdog/
-S:     Maintained
-
 ZR36067 VIDEO FOR LINUX DRIVER
 P:     Ronald Bultje
 M:     rbultje@ronald.bitfreak.net