1 files changed, 71 insertions, 29 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index bce7123d49d9..3f8a90ac47d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -182,7 +182,7 @@ S:	Supported
 ACPI
 P:      Len Brown
 M:      len.brown@intel.com
-L:      acpi-devel@lists.sourceforge.net
+L:      linux-acpi@vger.kernel.org
 W:      http://acpi.sourceforge.net/
 T:      git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 S:      Maintained
@@ -546,16 +546,10 @@ W:	http://linuxtv.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Maintained
 
-BUSLOGIC SCSI DRIVER
-P:      Leonard N. Zubkoff
-M:      Leonard N. Zubkoff <lnz@dandelion.com>
-L:      linux-scsi@vger.kernel.org
-W:      http://www.dandelion.com/Linux/
-S:      Maintained
-
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:      Steve French
 M:      sfrench@samba.org
+L:      linux-cifs-client@lists.samba.org
 L:      samba-technical@lists.samba.org
 W:      http://us1.samba.org/samba/Linux_CIFS_client.html
 T:      git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
@@ -811,6 +805,7 @@ S:	Maintained
 DOCBOOK FOR DOCUMENTATION
 P:      Martin Waitz
 M:      tali@admingilde.org
+T:      git http://tali.admingilde.org/git/linux-docbook.git
 S:      Maintained
 
 DOUBLETALK DRIVER
@@ -872,6 +867,15 @@ L:	ebtables-devel@lists.sourceforge.net
 W:      http://ebtables.sourceforge.net/
 S:      Maintained
 
+EDAC-CORE
+P:      Doug Thompson
+M:      norsk5@xmission.com, dthompson@linuxnetworx.com
+P:      Dave Peterson
+M:      dsp@llnl.gov, dave_peterson@pobox.com
+L:      bluesmoke-devel@lists.sourceforge.net
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+
 EEPRO100 NETWORK DRIVER
 P:      Andrey V. Savochkin
 M:      saw@saw.sw.com.sg
@@ -927,7 +931,6 @@ S:	Maintained
 FARSYNC SYNCHRONOUS DRIVER
 P:      Kevin Curtis
 M:      kevin.curtis@farsite.co.uk
-M:      kevin.curtis@farsite.co.uk
 W:      http://www.farsite.co.uk/
 S:      Supported
 
@@ -1307,6 +1310,12 @@ M:	ttb@tentacle.dhs.org and rml@novell.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
+P:      Sylvain Meyer
+M:      sylvain.meyer@worldonline.fr
+L:      linux-fbdev-devel@lists.sourceforge.net
+S:      Maintained
+
 INTEL 810/815 FRAMEBUFFER DRIVER
 P:      Antonino Daplas
 M:      adaplas@pol.net
@@ -1398,7 +1407,7 @@ IRDA SUBSYSTEM
 P:      Jean Tourrilhes
 L:      irda-users@lists.sourceforge.net (subscribers-only)
 W:      http://irda.sourceforge.net/
-S:      Maintained
+S:      Odd Fixes
 
 ISAPNP
 P:      Jaroslav Kysela
@@ -1696,12 +1705,13 @@ M: mtk-manpages@gmx.net
 W: ftp://ftp.kernel.org/pub/linux/docs/manpages
 S: Maintained
 
-MARVELL MV64340 ETHERNET DRIVER
+MARVELL MV643XX ETHERNET DRIVER
+P:      Dale Farnsworth
+M:      dale@farnsworth.org
 P:      Manish Lachwani
-M:      Manish_Lachwani@pmc-sierra.com
-L:      linux-mips@linux-mips.org
+M:      mlachwani@mvista.com
 L:      netdev@vger.kernel.org
-S:      Supported
+S:      Odd Fixes for 2.4; Maintained for 2.6.
 
 MATROX FRAMEBUFFER DRIVER
 P:      Petr Vandrovec
@@ -1842,7 +1852,14 @@ M:	yoshfuji@linux-ipv6.org
 P:      Patrick McHardy
 M:      kaber@coreworks.de
 L:      netdev@vger.kernel.org
-T:      git kernel.org:/pub/scm/linux/kernel/davem/net-2.6.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
+S:      Maintained
+
+NETWORKING [WIRELESS]
+P:      John W. Linville
+M:      linville@tuxdriver.com
+L:      netdev@vger.kernel.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:      Maintained
 
 IPVS
@@ -1897,11 +1914,11 @@ W:	http://linux-ntfs.sf.net/
 T:      git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
 S:      Maintained
 
-NVIDIA (RIVA) FRAMEBUFFER DRIVER
-P:      Ani Joshi
-M:      ajoshi@shell.unixbox.com
-L:      linux-nvidia@lists.surfsouth.com
-S:      Maintained
+NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
+P:      Antonino Daplas
+M:      adaplas@pol.net
+L:      linux-fbdev-devel@lists.sourceforge.net
+S:      Maintained
 
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 P:      Mark Fasheh
@@ -1996,6 +2013,13 @@ M:	hch@infradead.org
 L:      linux-abi-devel@lists.sourceforge.net
 S:      Maintained
 
+PCI ERROR RECOVERY
+P:      Linas Vepstas
+M:      linas@austin.ibm.com
+L:      linux-kernel@vger.kernel.org
+L:      linux-pci@atrey.karlin.mff.cuni.cz
+S:      Supported
+
 PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
 P:      Thomas Sailer
 M:      sailer@ife.ee.ethz.ch
@@ -2054,7 +2078,7 @@ S:	Maintained
 POSIX CLOCKS and TIMERS
 P:      George Anzinger
 M:      george@mvista.com
-L:      netdev@vger.kernel.org
+L:      linux-kernel@vger.kernel.org
 S:      Supported
 
 POWERPC 4xx EMAC DRIVER
@@ -2189,6 +2213,12 @@ L:	rtl@rtlinux.org
 W:      www.rtlinux.org
 S:      Maintained
 
+S3 SAVAGE FRAMEBUFFER DRIVER
+P:      Antonino Daplas
+M:      adaplas@pol.net
+L:      linux-fbdev-devel@lists.sourceforge.net
+S:      Maintained
+
 S390
 P:      Martin Schwidefsky
 M:      schwidefsky@de.ibm.com
@@ -2360,13 +2390,6 @@ P:	Nicolas Pitre
 M:      nico@cam.org
 S:      Maintained
 
-SNA NETWORK LAYER
-P:      Jay Schulist
-M:      jschlst@samba.org
-L:      linux-sna@turbolinux.com
-W:      http://www.linux-sna.org
-S:      Supported
-
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:      Ingo Molnar
 M:      mingo@redhat.com
@@ -2488,7 +2511,7 @@ P:	Paul Mundt
 M:      lethal@linux-sh.org
 P:      Kazumoto Kojima
 M:      kkojima@rr.iij4u.or.jp
-L:      linux-sh@m17n.org
+L:      linuxsh-dev@lists.sourceforge.net
 W:      http://www.linux-sh.org
 W:      http://www.m17n.org/linux-sh/
 W:      http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html
@@ -2527,6 +2550,19 @@ P:     Romain Lievin
 M:     roms@lpg.ticalc.org
 S:     Maintained
 
+TIPC NETWORK LAYER
+P:      Per Liden
+M:      per.liden@ericsson.com
+P:      Jon Maloy
+M:      jon.maloy@ericsson.com
+P:      Allan Stephens
+M:      allan.stephens@windriver.com
+L:      tipc-discussion@lists.sourceforge.net
+W:      http://tipc.sourceforge.net/
+W:      http://tipc.cslab.ericsson.net/
+T:      git tipc.cslab.ericsson.net:/pub/git/tipc.git
+S:      Maintained
+
 TLAN NETWORK DRIVER
 P:      Samuel Chessman
 M:      chessman@tux.org
@@ -2948,6 +2984,12 @@ M:	dm@sangoma.com
 W:      http://www.sangoma.com
 S:      Supported
 
+WATCHDOG DEVICE DRIVERS
+P:      Wim Van Sebroeck
+M:      wim@iguana.be
+T:      git kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
+S:      Maintained
+
 WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
 P:      Jean Tourrilhes
 M:      jt@hpl.hp.com