1 files changed, 38 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0db72a36e245..6d1b048c62a1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -549,6 +549,7 @@ 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
@@ -1300,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
@@ -1889,11 +1896,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
@@ -2053,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
@@ -2188,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
@@ -2519,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
@@ -2940,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