1 files changed, 14 insertions, 83 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9fc7c1c7e1bb..af279458b614 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -418,6 +418,12 @@ L:	linux-laptop@vger.kernel.org
 W:      http://www.canb.auug.org.au/~sfr/
 S:      Supported
 
+APPLE BCM5974 MULTITOUCH DRIVER
+P:      Henrik Rydberg
+M:      rydberg@euromail.se
+L:      linux-input@vger.kernel.org
+S:      Maintained
+
 APPLE SMC DRIVER
 P:      Nicolas Boichat
 M:      nicolas@boichat.ch
@@ -941,94 +947,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
-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
+W:      http://www.bluez.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
@@ -3125,7 +3056,7 @@ P:	Anton Altaparmakov
 M:      aia21@cantab.net
 L:      linux-ntfs-dev@lists.sourceforge.net
 L:      linux-kernel@vger.kernel.org
-W:      http://linux-ntfs.sf.net/
+W:      http://www.linux-ntfs.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
 S:      Maintained
 
@@ -4079,7 +4010,7 @@ S:      Maintained
 
 TI OMAP MMC INTERFACE DRIVER
 P:      Carlos Aguiar, Anderson Briglia and Syed Khasim
-M:      linux-omap-open-source@linux.omap.com (subscribers only)
+M:      linux-omap@vger.kernel.org
 W:      http://linux.omap.com
 W:      http://www.muru.com/linux/omap/
 S:      Maintained