[GFS2] Fix up merge of Linus' kernel into GFS2

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 766b1ad..b388988 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -883,6 +883,16 @@ M: jack@suse.cz
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+DISTRIBUTED LOCK MANAGER
+P:     Patrick Caulfield
+M:     pcaulfie@redhat.com
+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
+S:     Supported
+
 DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 P:     Tobias Ringstrom
 M:     tori@unhappy.mine.nu
@@ -1151,6 +1161,14 @@ M:       khc@pm.waw.pl
 W:     http://www.kernel.org/pub/linux/utils/net/hdlc/
 S:     Maintained
 
+GFS2 FILE SYSTEM
+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
+S:     Supported
+
 GIGASET ISDN DRIVERS
 P:     Hansjoerg Lipp
 M:     hjlipp@web.de
@@ -2490,8 +2508,8 @@ W:        http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 
 S390 ZFCP DRIVER
-P:     Andreas Herrmann
-M:     aherrman@de.ibm.com
+P:     Swen Schillig
+M:     swen@vnet.ibm.com
 M:     linux390@de.ibm.com
 L:     linux-390@vm.marist.edu
 W:     http://www.ibm.com/developerworks/linux/linux390/