Merge branch 'master' into gfs2

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 16af51b..cdb042f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -443,6 +443,23 @@ W: http://people.redhat.com/sgrubb/audit/
 T:     git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
 S:     Maintained
 
+AVR32 ARCHITECTURE
+P:     Atmel AVR32 Support Team
+M:     avr32@atmel.com
+P:     Haavard Skinnemoen
+M:     hskinnemoen@atmel.com
+W:     http://www.atmel.com/products/AVR32/
+W:     http://avr32linux.org/
+W:     http://avrfreaks.net/
+S:     Supported
+
+AVR32/AT32AP MACHINE SUPPORT
+P:     Atmel AVR32 Support Team
+M:     avr32@atmel.com
+P:     Haavard Skinnemoen
+M:     hskinnemoen@atmel.com
+S:     Supported
+
 AX.25 NETWORK LAYER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org
@@ -883,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
@@ -1151,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
@@ -2031,6 +2066,13 @@ L:       netfilter@lists.netfilter.org
 L:     netfilter-devel@lists.netfilter.org
 S:     Supported
 
+NETLABEL
+P:     Paul Moore
+M:     paul.moore@hp.com
+W:     http://netlabel.sf.net
+L:     netdev@vger.kernel.org
+S:     Supported
+
 NETROM NETWORK LAYER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org
@@ -2655,7 +2697,6 @@ M:        josejx@gentoo.org
 P:     Daniel Drake
 M:     dsd@gentoo.org
 W:     http://softmac.sipsolutions.net/
-L:     softmac-dev@sipsolutions.net
 L:     netdev@vger.kernel.org
 S:     Maintained