aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 13:37:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 13:37:28 -0400
commitd7e9660ad9d5e0845f52848bce31bcf5cdcdea6b (patch)
treec6c67d145771187b194d79d603742b31090a59d6 /MAINTAINERS
parentb8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca (diff)
parent13af7a6ea502fcdd4c0e3d7de6e332b102309491 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits) netxen: update copyright netxen: fix tx timeout recovery netxen: fix file firmware leak netxen: improve pci memory access netxen: change firmware write size tg3: Fix return ring size breakage netxen: build fix for INET=n cdc-phonet: autoconfigure Phonet address Phonet: back-end for autoconfigured addresses Phonet: fix netlink address dump error handling ipv6: Add IFA_F_DADFAILED flag net: Add DEVTYPE support for Ethernet based devices mv643xx_eth.c: remove unused txq_set_wrr() ucc_geth: Fix hangs after switching from full to half duplex ucc_geth: Rearrange some code to avoid forward declarations phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs drivers/net/phy: introduce missing kfree drivers/net/wan: introduce missing kfree net: force bridge module(s) to be GPL Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded ... Fixed up trivial conflicts: - arch/x86/include/asm/socket.h converted to <asm-generic/socket.h> in the x86 tree. The generic header has the same new #define's, so that works out fine. - drivers/net/tun.c fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that switched over to using 'tun->socket.sk' instead of the redundantly available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks to the TUN driver") which added a new 'tun->sk' use. Noted in 'next' by Stephen Rothwell.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS52
1 files changed, 39 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 989ff1149390..e95cb772f931 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -876,6 +876,7 @@ M: "Luis R. Rodriguez" <lrodriguez@atheros.com>
876M: Bob Copeland <me@bobcopeland.com> 876M: Bob Copeland <me@bobcopeland.com>
877L: linux-wireless@vger.kernel.org 877L: linux-wireless@vger.kernel.org
878L: ath5k-devel@lists.ath5k.org 878L: ath5k-devel@lists.ath5k.org
879W: http://wireless.kernel.org/en/users/Drivers/ath5k
879S: Maintained 880S: Maintained
880F: drivers/net/wireless/ath/ath5k/ 881F: drivers/net/wireless/ath/ath5k/
881 882
@@ -887,6 +888,7 @@ M: Vasanthakumar Thiagarajan <vasanth@atheros.com>
887M: Senthil Balasubramanian <senthilkumar@atheros.com> 888M: Senthil Balasubramanian <senthilkumar@atheros.com>
888L: linux-wireless@vger.kernel.org 889L: linux-wireless@vger.kernel.org
889L: ath9k-devel@lists.ath9k.org 890L: ath9k-devel@lists.ath9k.org
891W: http://wireless.kernel.org/en/users/Drivers/ath9k
890S: Supported 892S: Supported
891F: drivers/net/wireless/ath/ath9k/ 893F: drivers/net/wireless/ath/ath9k/
892 894
@@ -2660,25 +2662,21 @@ F: drivers/net/ixgbe/
2660 2662
2661INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT 2663INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
2662M: Zhu Yi <yi.zhu@intel.com> 2664M: Zhu Yi <yi.zhu@intel.com>
2663M: James Ketrenos <jketreno@linux.intel.com>
2664M: Reinette Chatre <reinette.chatre@intel.com> 2665M: Reinette Chatre <reinette.chatre@intel.com>
2666M: Intel Linux Wireless <ilw@linux.intel.com>
2665L: linux-wireless@vger.kernel.org 2667L: linux-wireless@vger.kernel.org
2666L: ipw2100-devel@lists.sourceforge.net
2667W: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
2668W: http://ipw2100.sourceforge.net 2668W: http://ipw2100.sourceforge.net
2669S: Supported 2669S: Odd Fixes
2670F: Documentation/networking/README.ipw2100 2670F: Documentation/networking/README.ipw2100
2671F: drivers/net/wireless/ipw2x00/ipw2100.* 2671F: drivers/net/wireless/ipw2x00/ipw2100.*
2672 2672
2673INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT 2673INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
2674M: Zhu Yi <yi.zhu@intel.com> 2674M: Zhu Yi <yi.zhu@intel.com>
2675M: James Ketrenos <jketreno@linux.intel.com>
2676M: Reinette Chatre <reinette.chatre@intel.com> 2675M: Reinette Chatre <reinette.chatre@intel.com>
2676M: Intel Linux Wireless <ilw@linux.intel.com>
2677L: linux-wireless@vger.kernel.org 2677L: linux-wireless@vger.kernel.org
2678L: ipw2100-devel@lists.sourceforge.net
2679W: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
2680W: http://ipw2200.sourceforge.net 2678W: http://ipw2200.sourceforge.net
2681S: Supported 2679S: Odd Fixes
2682F: Documentation/networking/README.ipw2200 2680F: Documentation/networking/README.ipw2200
2683F: drivers/net/wireless/ipw2x00/ipw2200.* 2681F: drivers/net/wireless/ipw2x00/ipw2200.*
2684 2682
@@ -2695,8 +2693,8 @@ F: include/linux/wimax/i2400m.h
2695INTEL WIRELESS WIFI LINK (iwlwifi) 2693INTEL WIRELESS WIFI LINK (iwlwifi)
2696M: Zhu Yi <yi.zhu@intel.com> 2694M: Zhu Yi <yi.zhu@intel.com>
2697M: Reinette Chatre <reinette.chatre@intel.com> 2695M: Reinette Chatre <reinette.chatre@intel.com>
2696M: Intel Linux Wireless <ilw@linux.intel.com>
2698L: linux-wireless@vger.kernel.org 2697L: linux-wireless@vger.kernel.org
2699L: ipw3945-devel@lists.sourceforge.net
2700W: http://intellinuxwireless.org 2698W: http://intellinuxwireless.org
2701T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git 2699T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
2702S: Supported 2700S: Supported
@@ -3279,6 +3277,12 @@ S: Supported
3279F: drivers/net/mv643xx_eth.* 3277F: drivers/net/mv643xx_eth.*
3280F: include/linux/mv643xx.h 3278F: include/linux/mv643xx.h
3281 3279
3280MARVELL MWL8K WIRELESS DRIVER
3281M: Lennert Buytenhek <buytenh@marvell.com>
3282L: linux-wireless@vger.kernel.org
3283S: Supported
3284F: drivers/net/wireless/mwl8k.c
3285
3282MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER 3286MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
3283M: Nicolas Pitre <nico@cam.org> 3287M: Nicolas Pitre <nico@cam.org>
3284S: Maintained 3288S: Maintained
@@ -3591,9 +3595,12 @@ M: "John W. Linville" <linville@tuxdriver.com>
3591L: linux-wireless@vger.kernel.org 3595L: linux-wireless@vger.kernel.org
3592T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git 3596T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
3593S: Maintained 3597S: Maintained
3598F: net/mac80211/
3599F: net/rfkill/
3594F: net/wireless/ 3600F: net/wireless/
3595F: include/net/ieee80211* 3601F: include/net/ieee80211*
3596F: include/linux/wireless.h 3602F: include/linux/wireless.h
3603F: drivers/net/wireless/
3597 3604
3598NETWORKING DRIVERS 3605NETWORKING DRIVERS
3599L: netdev@vger.kernel.org 3606L: netdev@vger.kernel.org
@@ -4299,7 +4306,7 @@ L: linux-wireless@vger.kernel.org
4299W: http://linuxwireless.org/ 4306W: http://linuxwireless.org/
4300T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git 4307T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
4301S: Maintained 4308S: Maintained
4302F: drivers/net/wireless/rtl818* 4309F: drivers/net/wireless/rtl818x/rtl8180*
4303 4310
4304RTL8187 WIRELESS DRIVER 4311RTL8187 WIRELESS DRIVER
4305M: Herton Ronaldo Krzesinski <herton@mandriva.com.br> 4312M: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
@@ -4526,9 +4533,10 @@ S: Supported
4526F: drivers/net/benet/ 4533F: drivers/net/benet/
4527 4534
4528SFC NETWORK DRIVER 4535SFC NETWORK DRIVER
4529P: Steve Hodgson 4536M: Solarflare linux maintainers <linux-net-drivers@solarflare.com>
4530P: Ben Hutchings 4537M: Steve Hodgson <shodgson@solarflare.com>
4531M: Robert Stonehouse <linux-net-drivers@solarflare.com> 4538M: Ben Hutchings <bhutchings@solarflare.com>
4539L: netdev@vger.kernel.org
4532S: Supported 4540S: Supported
4533F: drivers/net/sfc/ 4541F: drivers/net/sfc/
4534 4542
@@ -5578,6 +5586,24 @@ M: Miloslav Trmac <mitr@volny.cz>
5578S: Maintained 5586S: Maintained
5579F: drivers/input/misc/wistron_btns.c 5587F: drivers/input/misc/wistron_btns.c
5580 5588
5589WL1251 WIRELESS DRIVER
5590P: Kalle Valo
5591M: kalle.valo@nokia.com
5592L: linux-wireless@vger.kernel.org
5593W: http://wireless.kernel.org
5594T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
5595S: Maintained
5596F: drivers/net/wireless/wl12xx/*
5597X: drivers/net/wireless/wl12xx/wl1271*
5598
5599WL1271 WIRELESS DRIVER
5600M: Luciano Coelho <luciano.coelho@nokia.com>
5601L: linux-wireless@vger.kernel.org
5602W: http://wireless.kernel.org
5603T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
5604S: Maintained
5605F: drivers/net/wireless/wl12xx/wl1271*
5606
5581WL3501 WIRELESS PCMCIA CARD DRIVER 5607WL3501 WIRELESS PCMCIA CARD DRIVER
5582M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> 5608M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
5583L: linux-wireless@vger.kernel.org 5609L: linux-wireless@vger.kernel.org