1 files changed, 47 insertions, 97 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8223a521d7c3..28c69aaefcd9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -175,12 +175,18 @@ M:	bcrl@kvack.org
 L:      linux-aio@kvack.org
 S:      Supported
 
-ABIT UGURU HARDWARE MONITOR DRIVER
+ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
 P:      Hans de Goede
 M:      j.w.r.degoede@hhs.nl
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
+ABIT UGURU 3 HARDWARE MONITOR DRIVER
+P:      Alistair John Strachan
+M:      alistair@devzero.co.uk
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 ACENIC DRIVER
 P:      Jes Sorensen
 M:      jes@trained-monkey.org
@@ -594,6 +600,11 @@ M:	kernel@wantstofly.org
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
+ARM/MAGICIAN MACHINE SUPPORT
+P:      Philipp Zabel
+M:      philipp.zabel@gmail.com
+S:      Maintained
+
 ARM/TOSA MACHINE SUPPORT
 P:      Dmitry Baryshkov
 M:      dbaryshkov@gmail.com
@@ -720,6 +731,15 @@ L:	linux-wireless@vger.kernel.org
 L:      ath5k-devel@lists.ath5k.org
 S:      Maintained
 
+ATHEROS ATH9K WIRELESS DRIVER
+P:      Luis R. Rodriguez
+M:      lrodriguez@atheros.com
+P:      Jouni Malinen
+M:      jmalinen@atheros.com
+L:      linux-wireless@vger.kernel.org
+L:      ath9k-devel@lists.ath9k.org
+S:      Supported
+
 ATI_REMOTE2 DRIVER
 P:      Ville Syrjala
 M:      syrjala@sci.fi
@@ -922,94 +942,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
-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
+W:      http://www.bluez.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
@@ -1235,7 +1180,7 @@ S:	Maintained
 CPU FREQUENCY DRIVERS
 P:      Dave Jones
 M:      davej@codemonkey.org.uk
-L:      cpufreq@lists.linux.org.uk
+L:      cpufreq@vger.kernel.org
 W:      http://www.codemonkey.org.uk/projects/cpufreq/
 T:      git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
 S:      Maintained
@@ -2448,7 +2393,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
@@ -2914,6 +2859,12 @@ M:	jirislaby@gmail.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
+P:     Felipe Balbi
+M:     felipe.balbi@nokia.com
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 P:      Andrew Gallatin
 M:      gallatin@myri.com
@@ -3062,9 +3013,10 @@ M:	horms@verge.net.au
 P:      Julian Anastasov
 M:      ja@ssi.bg
 L:      netdev@vger.kernel.org
+L:      lvs-devel@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
@@ -3727,6 +3679,16 @@ L:	linux-visws-devel@lists.sf.net
 W:      http://linux-visws.sf.net
 S:      Maintained for 2.6.
 
+SGI GRU DRIVER
+P:      Jack Steiner
+M:      steiner@sgi.com
+S:      Maintained
+
+SGI XP/XPC/XPNET DRIVER
+P:      Dean Nelson
+M:      dcn@sgi.com
+S:      Maintained
+
 SIMTEC EB110ATX (Chalice CATS)
 P:      Ben Dooks
 P:      Vincent Sanders
@@ -4181,12 +4143,6 @@ M:	oliver@neukum.name
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 
-USB AUERSWALD DRIVER
-P:      Wolfgang Muees
-M:      wolfgang@iksw-muees.de
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-
 USB BLOCK DRIVER (UB ub)
 P:      Pete Zaitcev
 M:      zaitcev@redhat.com
@@ -4669,12 +4625,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