aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 14:28:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 14:28:02 -0400
commit31cafd958932a90174118ad062fdc37ffb6bf31c (patch)
tree21f04c11d9e759c1f65cfaa1e4fbd79ee1e60753 /MAINTAINERS
parente7865c234fff2db474f21a62b2f906a70317c972 (diff)
parente2f5b04563786d4b7d7648868de7e941a0649372 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (52 commits) phylib: Add autoload support for the LXT973 phy. ISDN: hysdn, fix potential NULL dereference vxge: fix memory leak in vxge_alloc_msix() error path isdn/gigaset: correct CAPI connection state storage isdn/gigaset: encode HLC and BC together isdn/gigaset: correct CAPI DATA_B3 Delivery Confirmation isdn/gigaset: correct CAPI voice connection encoding isdn/gigaset: honor CAPI application's buffer size request cpmac: do not leak struct net_device on phy_connect errors smc91c92_cs: fix the problem that lan & modem does not work simultaneously ipv6: fix NULL reference in proxy neighbor discovery Bluetooth: Bring back var 'i' increment xfrm: check bundle policy existance before dereferencing it sky2: enable rx/tx in sky2_phy_reinit() cnic: Disable statistics initialization for eth clients that do not support statistics net: add dependency on fw class module to qlcnic and netxen_nic snmp: fix SNMP_ADD_STATS() hso: remove setting of low_latency flag udp: Fix bogus UFO packet generation lasi82596: fix netdev_mc_count conversion ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 2 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 78758e12a810..6c73b3bc7f34 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2985,20 +2985,14 @@ F: drivers/net/ixgb/
2985F: drivers/net/ixgbe/ 2985F: drivers/net/ixgbe/
2986 2986
2987INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT 2987INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
2988M: Reinette Chatre <reinette.chatre@intel.com>
2989M: Intel Linux Wireless <ilw@linux.intel.com>
2990L: linux-wireless@vger.kernel.org 2988L: linux-wireless@vger.kernel.org
2991W: http://ipw2100.sourceforge.net 2989S: Orphan
2992S: Odd Fixes
2993F: Documentation/networking/README.ipw2100 2990F: Documentation/networking/README.ipw2100
2994F: drivers/net/wireless/ipw2x00/ipw2100.* 2991F: drivers/net/wireless/ipw2x00/ipw2100.*
2995 2992
2996INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT 2993INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
2997M: Reinette Chatre <reinette.chatre@intel.com>
2998M: Intel Linux Wireless <ilw@linux.intel.com>
2999L: linux-wireless@vger.kernel.org 2994L: linux-wireless@vger.kernel.org
3000W: http://ipw2200.sourceforge.net 2995S: Orphan
3001S: Odd Fixes
3002F: Documentation/networking/README.ipw2200 2996F: Documentation/networking/README.ipw2200
3003F: drivers/net/wireless/ipw2x00/ipw2200.* 2997F: drivers/net/wireless/ipw2x00/ipw2200.*
3004 2998