Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 873c3f7cf0ffcdabc28a2039b1335f5817cc054e..6d1b048c62a105c12518f5ae1b67ec4a517d29bc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1301,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
@@ -1890,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
@@ -2189,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
@@ -2954,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