sctp: Try to encourage SACK bundling with DATA.

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 22af496..0ab47e7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2653,25 +2653,21 @@ F:      drivers/net/ixgbe/
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 M:     Zhu Yi <yi.zhu@intel.com>
-M:     James Ketrenos <jketreno@linux.intel.com>
 M:     Reinette Chatre <reinette.chatre@intel.com>
+M:     Intel Linux Wireless <ilw@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
-L:     ipw2100-devel@lists.sourceforge.net
-W:     http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:     http://ipw2100.sourceforge.net
-S:     Supported
+S:     Odd Fixes
 F:     Documentation/networking/README.ipw2100
 F:     drivers/net/wireless/ipw2x00/ipw2100.*
 
 INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
 M:     Zhu Yi <yi.zhu@intel.com>
-M:     James Ketrenos <jketreno@linux.intel.com>
 M:     Reinette Chatre <reinette.chatre@intel.com>
+M:     Intel Linux Wireless <ilw@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
-L:     ipw2100-devel@lists.sourceforge.net
-W:     http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:     http://ipw2200.sourceforge.net
-S:     Supported
+S:     Odd Fixes
 F:     Documentation/networking/README.ipw2200
 F:     drivers/net/wireless/ipw2x00/ipw2200.*
 
@@ -2688,8 +2684,8 @@ F:        include/linux/wimax/i2400m.h
 INTEL WIRELESS WIFI LINK (iwlwifi)
 M:     Zhu Yi <yi.zhu@intel.com>
 M:     Reinette Chatre <reinette.chatre@intel.com>
+M:     Intel Linux Wireless <ilw@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
-L:     ipw3945-devel@lists.sourceforge.net
 W:     http://intellinuxwireless.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
 S:     Supported
@@ -3272,6 +3268,12 @@ S:       Supported
 F:     drivers/net/mv643xx_eth.*
 F:     include/linux/mv643xx.h
 
+MARVELL MWL8K WIRELESS DRIVER
+M:     Lennert Buytenhek <buytenh@marvell.com>
+L:     linux-wireless@vger.kernel.org
+S:     Supported
+F:     drivers/net/wireless/mwl8k.c
+
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:     Nicolas Pitre <nico@cam.org>
 S:     Maintained
@@ -3583,9 +3585,12 @@ M:       "John W. Linville" <linville@tuxdriver.com>
 L:     linux-wireless@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:     Maintained
+F:     net/mac80211/
+F:     net/rfkill/
 F:     net/wireless/
 F:     include/net/ieee80211*
 F:     include/linux/wireless.h
+F:     drivers/net/wireless/
 
 NETWORKING DRIVERS
 L:     netdev@vger.kernel.org
@@ -4518,9 +4523,10 @@ S:       Supported
 F:     drivers/net/benet/
 
 SFC NETWORK DRIVER
-P:     Steve Hodgson
-P:     Ben Hutchings
-M:     Robert Stonehouse <linux-net-drivers@solarflare.com>
+M:     Solarflare linux maintainers <linux-net-drivers@solarflare.com>
+M:     Steve Hodgson <shodgson@solarflare.com>
+M:     Ben Hutchings <bhutchings@solarflare.com>
+L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/sfc/
 
@@ -5577,7 +5583,16 @@ L:       linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
-F:     drivers/net/wireless/wl12xx/wl1251*
+F:     drivers/net/wireless/wl12xx/*
+X:     drivers/net/wireless/wl12xx/wl1271*
+
+WL1271 WIRELESS DRIVER
+M:     Luciano Coelho <luciano.coelho@nokia.com>
+L:     linux-wireless@vger.kernel.org
+W:     http://wireless.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
+S:     Maintained
+F:     drivers/net/wireless/wl12xx/wl1271*
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>