Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a7b0b36e8b456d1fbf2d147221300d1bb5fd6f8..0ea3a6d987149dfd7113b2ada91097b21aaefb6d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -911,7 +911,7 @@ S:  Maintained
 BLACKFIN ARCHITECTURE
 P:     Bryan Wu
 M:     [email protected]
-L:     [email protected] (subscribers-only)
+L:     [email protected]
 W:     http://blackfin.uclinux.org
 S:     Supported
 
@@ -2220,7 +2220,7 @@ P:        Sean Hefty
 M:     [email protected]
 P:     Hal Rosenstock
 M:     [email protected]
-L:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
 W:     http://www.openib.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:     Supported
@@ -2844,8 +2844,6 @@ S:        Maintained
 MAC80211
 P:     Johannes Berg
 M:     [email protected]
-P:     Michael Wu
-M:     [email protected]
 L:     [email protected]
 W:     http://linuxwireless.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@ -4851,6 +4849,7 @@ P:        Ingo Molnar
 M:     [email protected]
 P:     H. Peter Anvin
 M:     [email protected]
+M:     [email protected]
 L:     [email protected]
 T:     git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
 S:     Maintained