1 files changed, 91 insertions, 44 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6af683025ae0..6d1b048c62a1 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
@@ -258,6 +258,13 @@ P:	Ivan Kokshaysky
 M:      ink@jurassic.park.msu.ru
 S:      Maintained for 2.4; PCI support for 2.6.
 
+AMD GEODE PROCESSOR/CHIPSET SUPPORT
+P:      Jordan Crouse
+M:      info-linux@geode.amd.com
+L:      info-linux@geode.amd.com
+W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
+S:      Supported
+
 APM DRIVER
 P:      Stephen Rothwell
 M:      sfr@canb.auug.org.au
@@ -539,21 +546,20 @@ 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
 S:      Supported       
 
+CONFIGFS
+P:      Joel Becker
+M:      Joel Becker <joel.becker@oracle.com>
+S:      Supported
+
 CIRRUS LOGIC GENERIC FBDEV DRIVER
 P:      Jeff Garzik
 M:      jgarzik@pobox.com
@@ -650,6 +656,11 @@ L:	linux-crypto@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
 S:      Maintained
 
+CS5535 Audio ALSA driver
+P:      Jaya Kumar
+M:      jayakumar.alsa@gmail.com
+S:      Maintained
+
 CYBERPRO FB DRIVER
 P:      Russell King
 M:      rmk@arm.linux.org.uk
@@ -679,13 +690,6 @@ M:	pc300@cyclades.com
 W:      http://www.cyclades.com/
 S:      Supported
 
-DAC960 RAID CONTROLLER DRIVER
-P:      Dave Olien
-M       dmo@osdl.org
-W:      http://www.osdl.org/archive/dmo/DAC960
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
 DAMA SLAVE for AX.25
 P:      Joerg Reuter
 M:      jreuter@yaina.de
@@ -801,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
@@ -917,7 +922,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
 
@@ -1225,7 +1229,7 @@ IEEE 1394 SUBSYSTEM
 P:      Ben Collins
 M:      bcollins@debian.org
 P:      Jody McIntyre
-M:      scjody@steamballoon.com
+M:      scjody@modernduck.com
 L:      linux1394-devel@lists.sourceforge.net
 W:      http://www.linux1394.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git
@@ -1235,14 +1239,14 @@ IEEE 1394 OHCI DRIVER
 P:      Ben Collins
 M:      bcollins@debian.org
 P:      Jody McIntyre
-M:      scjody@steamballoon.com
+M:      scjody@modernduck.com
 L:      linux1394-devel@lists.sourceforge.net
 W:      http://www.linux1394.org/
 S:      Maintained
 
 IEEE 1394 PCILYNX DRIVER
 P:      Jody McIntyre
-M:      scjody@steamballoon.com
+M:      scjody@modernduck.com
 L:      linux1394-devel@lists.sourceforge.net
 W:      http://www.linux1394.org/
 S:      Maintained
@@ -1297,6 +1301,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
@@ -1465,7 +1475,6 @@ P:	Several
 L:      kernel-janitors@osdl.org
 W:      http://www.kerneljanitors.org/
 W:      http://sf.net/projects/kernel-janitor/
-W:      http://developer.osdl.org/rddunlap/kj-patches/
 S:      Maintained
 
 KERNEL NFSD
@@ -1476,17 +1485,11 @@ W:	http://nfs.sourceforge.net/
 W:      http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
 S:      Maintained
 
-KERNEL EVENT LAYER (KOBJECT_UEVENT)
-P:      Robert Love
-M:      rml@novell.com
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
 KEXEC
 P:      Eric Biederman
 P:      Randy Dunlap
 M:      ebiederm@xmission.com
-M:      rddunlap@osdl.org
+M:      rdunlap@xenotime.net
 W:      http://www.xmission.com/~ebiederm/files/kexec/
 L:      linux-kernel@vger.kernel.org
 L:      fastboot@osdl.org
@@ -1695,7 +1698,6 @@ S: Maintained
 
 MARVELL MV64340 ETHERNET DRIVER
 P:      Manish Lachwani
-M:      Manish_Lachwani@pmc-sierra.com
 L:      linux-mips@linux-mips.org
 L:      netdev@vger.kernel.org
 S:      Supported
@@ -1894,11 +1896,20 @@ 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
+M:      mark.fasheh@oracle.com
+P:      Kurt Hackel
+M:      kurt.hackel@oracle.com
+L:      ocfs2-devel@oss.oracle.com
+W:      http://oss.oracle.com/projects/ocfs2/
+S:      Supported       
 
 OLYMPIC NETWORK DRIVER
 P:      Peter De Shrijver
@@ -1984,6 +1995,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
@@ -2042,7 +2060,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
@@ -2177,6 +2195,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
@@ -2348,13 +2372,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
@@ -2476,7 +2493,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
@@ -2515,6 +2532,19 @@ P:     Romain Lievin
 M:     roms@lpg.ticalc.org
 S:     Maintained
 
+TIPC NETWORK LAYER
+P:      Per Liden
+M:      per.liden@nospam.ericsson.com
+P:      Jon Maloy
+M:      jon.maloy@nospam.ericsson.com
+P:      Allan Stephens
+M:      allan.stephens@nospam.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
@@ -2587,7 +2617,6 @@ S:	Maintained
 UDF FILESYSTEM
 P:      Ben Fennema
 M:      bfennema@falcon.csc.calpoly.edu
-L:      linux_udf@hpesjro.fc.hp.com
 W:      http://linux-udf.sourceforge.net
 S:      Maintained
 
@@ -2640,6 +2669,12 @@ L:	linux-usb-users@lists.sourceforge.net
 L:      linux-usb-devel@lists.sourceforge.net
 S:      Maintained
 
+USB ISP116X DRIVER
+P:      Olav Kongas
+M:      ok@artecdesign.ee
+L:      linux-usb-devel@lists.sourceforge.net
+S:      Maintained
+
 USB KAWASAKI LSI DRIVER
 P:      Oliver Neukum
 M:      oliver@neukum.name
@@ -2651,7 +2686,7 @@ USB MASS STORAGE DRIVER
 P:      Matthew Dharm
 M:      mdharm-usb@one-eyed-alien.net
 L:      linux-usb-users@lists.sourceforge.net
-L:      linux-usb-devel@lists.sourceforge.net
+L:      usb-storage@lists.one-eyed-alien.net
 S:      Maintained
 W:      http://www.one-eyed-alien.net/~mdharm/linux-usb/
 
@@ -2899,6 +2934,12 @@ W:	http://linuxtv.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Maintained
 
+VT8231 HARDWARE MONITOR DRIVER
+P:      Roger Lucas
+M:      roger@planbit.co.uk
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 W1 DALLAS'S 1-WIRE BUS
 P:      Evgeniy Polyakov
 M:      johnpol@2ka.mipt.ru
@@ -2925,6 +2966,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