Merge branch 'master' into gfs2

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 28e1c7b..7c238e4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -501,7 +501,7 @@ S:  Maintained
 
 BLOCK LAYER
 P:     Jens Axboe
-M:     axboe@suse.de
+M:     axboe@kernel.dk
 L:     linux-kernel@vger.kernel.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
 S:     Maintained
@@ -900,6 +900,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
@@ -1168,6 +1178,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
@@ -1380,7 +1398,7 @@ S:        Maintained
 
 IDE/ATAPI CDROM DRIVER
 P:     Jens Axboe
-M:     axboe@suse.de
+M:     axboe@kernel.dk
 L:     linux-kernel@vger.kernel.org
 W:     http://www.kernel.dk
 S:     Maintained
@@ -2531,7 +2549,7 @@ S:        Maintained
 
 SCSI CDROM DRIVER
 P:     Jens Axboe
-M:     axboe@suse.de
+M:     axboe@kernel.dk
 L:     linux-scsi@vger.kernel.org
 W:     http://www.kernel.dk
 S:     Maintained
@@ -2976,7 +2994,7 @@ S:        Maintained
 
 UNIFORM CDROM DRIVER
 P:     Jens Axboe
-M:     axboe@suse.de
+M:     axboe@kernel.dk
 L:     linux-kernel@vger.kernel.org
 W:     http://www.kernel.dk
 S:     Maintained