Merge current mainline tree into linux-omap tree

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 525d09b48801a19c8baa5e98ea4f7175b8da7146..11800c33ea84760575944dbca4e5fd3458ff3086 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -684,6 +684,11 @@ L: linux-wireless@vger.kernel.org
 L:     ath5k-devel@lists.ath5k.org
 S:     Maintained
 
+ATI_REMOTE2 DRIVER
+P:     Ville Syrjala
+M:     syrjala@sci.fi
+S:     Maintained
+
 ATL1 ETHERNET DRIVER
 P:     Jay Cliburn
 M:     jcliburn@gmail.com
@@ -2947,7 +2952,7 @@ P:        Mark Fasheh
 M:     mfasheh@suse.com
 P:     Joel Becker
 M:     joel.becker@oracle.com
-L:     ocfs2-devel@oss.oracle.com
+L:     ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:     http://oss.oracle.com/projects/ocfs2/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
 S:     Supported
@@ -3856,7 +3861,7 @@ S:      Maintained
 
 TI OMAP MMC INTERFACE DRIVER
 P:     Carlos Aguiar, Anderson Briglia and Syed Khasim
-M:     linux-omap-open-source@linux.omap.com (subscribers only)
+M:     linux-omap@vger.kernel.org
 W:     http://linux.omap.com
 W:     http://www.muru.com/linux/omap/
 S:     Maintained