Merge branch 'master' into gfs2

1 files changed, 24 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b3889889b602..cdb042f69520 100644
--- 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
@@ -2049,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
@@ -2673,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