Merge ../linux-2.6

1 files changed, 1 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1446cc41c12f..465e083237a7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -598,8 +598,6 @@ W:	http://linux-atm.sourceforge.net
 S:      Maintained
 
 ATMEL MACB ETHERNET DRIVER
-P:      Atmel AVR32 Support Team
-M:      avr32@atmel.com
 P:      Haavard Skinnemoen
 M:      hskinnemoen@atmel.com
 S:      Supported
@@ -620,8 +618,6 @@ 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/
@@ -630,8 +626,6 @@ 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
@@ -2288,7 +2282,7 @@ P:	Jozsef Kadlecsik
 P:      Patrick McHardy
 M:      kaber@trash.net
 L:      netfilter-devel@lists.netfilter.org
-L:      netfilter@lists.netfilter.org
+L:      netfilter@lists.netfilter.org (subscribers-only)
 L:      coreteam@netfilter.org
 W:      http://www.netfilter.org/
 W:      http://www.iptables.org/