Merge branch 'master' into upstream

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bd446e251d5b88f7a63852e50324cc2a62b5ddec..63673e6513b717994de75ffb552f546f3c140ab8 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
 
 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
 AX.25 NETWORK LAYER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org


@@ -2031,6 +2048,13 @@ L:       netfilter@lists.netfilter.org
 L:     netfilter-devel@lists.netfilter.org
 S:     Supported
 
 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
 NETROM NETWORK LAYER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org