Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 846e77a..8385a69 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -432,6 +432,13 @@ L: linux-atm-general@lists.sourceforge.net (subscribers-only)
 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
+
 ATMEL WIRELESS DRIVER
 P:     Simon Kelley
 M:     simon@thekelleys.org.uk
@@ -1159,11 +1166,6 @@ P:       David Howells
 M:     dhowells@redhat.com
 S:     Maintained
 
-FTAPE/QIC-117
-L:     linux-tape@vger.kernel.org
-W:     http://sourceforge.net/projects/ftape
-S:     Orphan
-
 FUSE: FILESYSTEM IN USERSPACE
 P:     Miklos Szeredi
 M:     miklos@szeredi.hu
@@ -2132,6 +2134,13 @@ L:       netdev@vger.kernel.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:     Maintained
 
+NETXEN (1/10) GbE SUPPORT
+P:     Amit S. Kale
+M:     amitkale@netxen.com
+L:     netdev@vger.kernel.org
+W:     http://www.netxen.com
+S:     Supported
+
 IPVS
 P:     Wensong Zhang
 M:     wensong@linux-vs.org