1 files changed, 79 insertions, 63 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 37debda36661..c3a533d5d382 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -752,11 +752,13 @@ W:	http://atmelwlandriver.sourceforge.net/
 S:      Maintained
 
 AUDIT SUBSYSTEM
-P:      David Woodhouse
-M:      dwmw2@infradead.org
+P:      Al Viro
+M:      viro@zeniv.linux.org.uk
+P:      Eric Paris
+M:      eparis@redhat.com
 L:      linux-audit@redhat.com (subscribers-only)
 W:      http://people.redhat.com/sgrubb/audit/
-T:      git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
+T:      git git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
 S:      Maintained
 
 AUXILIARY DISPLAY DRIVERS
@@ -1037,7 +1039,7 @@ P:	Urs Thuermann
 M:      urs.thuermann@volkswagen.de
 P:      Oliver Hartkopp
 M:      oliver.hartkopp@volkswagen.de
-L:      socketcan-core@lists.berlios.de
+L:      socketcan-core@lists.berlios.de (subscribers-only)
 W:      http://developer.berlios.de/projects/socketcan/
 S:      Maintained
 
@@ -2701,7 +2703,7 @@ P:	David Howells
 M:      dhowells@redhat.com
 P:      Koichi Yasutake
 M:      yasutake.koichi@jp.panasonic.com
-L:      linux-am33-list@redhat.com
+L:      linux-am33-list@redhat.com (moderated for non-subscribers)
 W:      ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
 S:      Maintained
 
@@ -2764,7 +2766,7 @@ M:	rubini@ipvvis.unipv.it
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-MOXA SMARTIO/INDUSTIO SERIAL CARD (MXSER 2.0)
+MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
 P:      Jiri Slaby
 M:      jirislaby@gmail.com
 L:      linux-kernel@vger.kernel.org
@@ -3121,6 +3123,7 @@ P:	Jesse Barnes
 M:      jbarnes@virtuousgeek.org
 L:      linux-kernel@vger.kernel.org
 L:      linux-pci@atrey.karlin.mff.cuni.cz
+T:      git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
 S:      Supported
 
 PCI HOTPLUG CORE
@@ -3581,6 +3584,13 @@ M:	pfg@sgi.com
 L:      linux-ia64@vger.kernel.org
 S:      Supported
 
+SFC NETWORK DRIVER
+P:      Steve Hodgson
+P:      Ben Hutchings
+P:      Robert Stonehouse
+M:      linux-net-drivers@solarflare.com
+S:      Supported
+
 SGI VISUAL WORKSTATION 320 AND 540
 P:      Andrey Panin
 M:      pazke@donpac.ru
@@ -3747,42 +3757,6 @@ M:	chrisw@sous-sol.org
 L:      stable@kernel.org
 S:      Maintained
 
-TPM DEVICE DRIVER
-P:      Kylene Hall
-M:      tpmdd-devel@lists.sourceforge.net
-W:      http://tpmdd.sourceforge.net
-P:      Marcel Selhorst
-M:      tpm@selhorst.net
-W:      http://www.prosec.rub.de/tpm/
-L:      tpmdd-devel@lists.sourceforge.net
-S:      Maintained
-
-Telecom Clock Driver for MCPL0010
-P:      Mark Gross
-M:      mark.gross@intel.com
-S:      Supported
-
-TENSILICA XTENSA PORT (xtensa):
-P:      Chris Zankel
-M:      chris@zankel.net
-S:      Maintained
-
-THINKPAD ACPI EXTRAS DRIVER
-P:      Henrique de Moraes Holschuh
-M:      ibm-acpi@hmh.eng.br
-L:      ibm-acpi-devel@lists.sourceforge.net
-W:      http://ibm-acpi.sourceforge.net
-W:      http://thinkwiki.org/wiki/Ibm-acpi
-T:      git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
-S:      Maintained
-
-UltraSPARC (sparc64):
-P:      David S. Miller
-M:      davem@davemloft.net
-L:      sparclinux@vger.kernel.org
-T:      git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
-S:      Maintained
-
 SHARP LH SUPPORT (LH7952X & LH7A40X)
 P:      Marc Singer
 M:      elf@buici.com
@@ -3879,6 +3853,12 @@ P:	Christoph Hellwig
 M:      hch@infradead.org
 S:      Maintained
 
+TASKSTATS STATISTICS INTERFACE
+P:      Shailabh Nagar
+M:      nagar@watson.ibm.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 TC CLASSIFIER
 P:      Jamal Hadi Salim
 M:      hadi@cyberus.ca
@@ -3901,6 +3881,25 @@ M:	andy@greyhouse.net
 L:      netdev@vger.kernel.org
 S:      Supported
 
+Telecom Clock Driver for MCPL0010
+P:      Mark Gross
+M:      mark.gross@intel.com
+S:      Supported
+
+TENSILICA XTENSA PORT (xtensa):
+P:      Chris Zankel
+M:      chris@zankel.net
+S:      Maintained
+
+THINKPAD ACPI EXTRAS DRIVER
+P:      Henrique de Moraes Holschuh
+M:      ibm-acpi@hmh.eng.br
+L:      ibm-acpi-devel@lists.sourceforge.net
+W:      http://ibm-acpi.sourceforge.net
+W:      http://thinkwiki.org/wiki/Ibm-acpi
+T:      git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
+S:      Maintained
+
 TI FLASH MEDIA INTERFACE DRIVER
 P:      Alex Dubov
 M:      oakad@yahoo.com
@@ -3918,12 +3917,6 @@ P:	Deepak Saxena
 M:      dsaxena@plexity.net
 S:      Maintained
 
-TASKSTATS STATISTICS INTERFACE
-P:      Shailabh Nagar
-M:      nagar@watson.ibm.com
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
 TIPC NETWORK LAYER
 P:      Per Liden
 M:      per.liden@ericsson.com
@@ -3957,6 +3950,16 @@ L:	tlinux-users@tce.toshiba-dme.co.jp
 W:      http://www.buzzard.org.uk/toshiba/
 S:      Maintained
 
+TPM DEVICE DRIVER
+P:      Kylene Hall
+M:      tpmdd-devel@lists.sourceforge.net
+W:      http://tpmdd.sourceforge.net
+P:      Marcel Selhorst
+M:      tpm@selhorst.net
+W:      http://www.prosec.rub.de/tpm/
+L:      tpmdd-devel@lists.sourceforge.net
+S:      Maintained
+
 TRIDENT 4DWAVE/SIS 7018 PCI AUDIO CORE
 P:      Muli Ben-Yehuda
 M:      mulix@mulix.org
@@ -3969,6 +3972,12 @@ M:	trivial@kernel.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+TTY LAYER
+P:      Alan Cox
+M:      alan@lxorguk.ukuu.org.uk
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 TULIP NETWORK DRIVERS
 P:      Grant Grundler
 M:      grundler@parisc-linux.org
@@ -4137,6 +4146,20 @@ L:      linux-usb@vger.kernel.org
 W:      http://www.chello.nl/~j.vreeken/se401/
 S:      Maintained
 
+USB SERIAL BELKIN F5U103 DRIVER
+P:      William Greathouse
+M:      wgreathouse@smva.com
+L:      linux-usb@vger.kernel.org
+S:      Maintained
+
+USB SERIAL CYPRESS M8 DRIVER
+P:      Lonnie Mendez
+M:      dignome@gmail.com
+L:      linux-usb@vger.kernel.org
+S:      Maintained
+W:      http://geocities.com/i0xox0i
+W:      http://firstlight.net/cvs
+
 USB SERIAL CYBERJACK DRIVER
 P:      Matthias Bruestle and Harald Welte
 M:      support@reiner-sct.com
@@ -4156,20 +4179,6 @@ M:	gregkh@suse.de
 L:      linux-usb@vger.kernel.org
 S:      Supported
 
-USB SERIAL BELKIN F5U103 DRIVER
-P:      William Greathouse
-M:      wgreathouse@smva.com
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-
-USB SERIAL CYPRESS M8 DRIVER
-P:      Lonnie Mendez
-M:      dignome@gmail.com
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-W:      http://geocities.com/i0xox0i
-W:      http://firstlight.net/cvs
-
 USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER
 P:      Gary Brubaker
 M:      xavyer@ix.netcom.com
@@ -4272,7 +4281,7 @@ M:	gregkh@suse.de
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-FAT/VFAT/MSDOS FILESYSTEM:
+VFAT/FAT/MSDOS FILESYSTEM:
 P:      OGAWA Hirofumi
 M:      hirofumi@mail.parknet.co.jp
 L:      linux-kernel@vger.kernel.org
@@ -4317,6 +4326,13 @@ M:	dushistov@mail.ru
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+UltraSPARC (sparc64):
+P:      David S. Miller
+M:      davem@davemloft.net
+L:      sparclinux@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
+S:      Maintained
+
 USB DIAMOND RIO500 DRIVER
 P:      Cesar Miquel
 M:      miquel@df.uba.ar