Pull asus into test branch

[powerpc.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 50fb3ae..1b5430a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -905,7 +905,8 @@ P:  David Teigland
 M:     teigland@redhat.com
 L:     cluster-devel@redhat.com
 W:     http://sources.redhat.com/cluster/
-T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git
+T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
+T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
 S:     Supported
 
 DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
@@ -1188,7 +1189,8 @@ P:        Steven Whitehouse
 M:     swhiteho@redhat.com
 L:     cluster-devel@redhat.com
 W:     http://sources.redhat.com/cluster/
-T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git
+T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
+T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
 S:     Supported
 
 GIGASET ISDN DRIVERS
@@ -2780,14 +2782,7 @@ S:       Maintained
 UltraSPARC (sparc64):
 P:     David S. Miller
 M:     davem@davemloft.net
-P:     Eddie C. Dost
-M:     ecd@brainaid.de
-P:     Jakub Jelinek
-M:     jj@sunsite.ms.mff.cuni.cz
-P:     Anton Blanchard
-M:     anton@samba.org
 L:     sparclinux@vger.kernel.org
-L:     ultralinux@vger.kernel.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 S:     Maintained