aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-02 21:00:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-02 21:00:43 -0400
commit5933f2ae353a93b1d3b501bc63c925531849bbc7 (patch)
tree4b21f6a2e5f252651827c8cb7c9692e378ba04c2 /MAINTAINERS
parentadadfe48df3858c3c1ba52963502f38885ab2f3c (diff)
parentff538818f4a82c4cf02d2d6bd6ac5c7360b9d41d (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: (47 commits) sysctl: net: call unregister_net_sysctl_table where needed Revert: veth: remove unneeded ifname code from veth_newlink() smsc95xx: fix reset check tg3: Fix failure to enable WoL by default when possible networking: inappropriate ioctl operation should return ENOTTY amd8111e: trivial typo spelling: Negotitate -> Negotiate ipv4: don't spam dmesg with "Using LC-trie" messages af_unix: Only allow recv on connected seqpacket sockets. mii: add support of pause frames in mii_get_an net: ftmac100: fix scheduling while atomic during PHY link status change usbnet: Transfer of maintainership usbnet: add support for some Huawei modems with cdc-ether ports bnx2: cancel timer on device removal iwl4965: fix "Received BA when not expected" iwlagn: fix "Received BA when not expected" dsa/mv88e6131: fix unknown multicast/broadcast forwarding on mv88e6085 usbnet: Resubmit interrupt URB if device is open iwl4965: fix "TX Power requested while scanning" iwlegacy: led stay solid on when no traffic b43: trivial: update module info about ucode16_mimo firmware ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2199ba1323d2..16a5c5f2c6a6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6556,7 +6556,7 @@ S: Maintained
6556F: drivers/usb/host/uhci* 6556F: drivers/usb/host/uhci*
6557 6557
6558USB "USBNET" DRIVER FRAMEWORK 6558USB "USBNET" DRIVER FRAMEWORK
6559M: David Brownell <dbrownell@users.sourceforge.net> 6559M: Oliver Neukum <oneukum@suse.de>
6560L: netdev@vger.kernel.org 6560L: netdev@vger.kernel.org
6561W: http://www.linux-usb.org/usbnet 6561W: http://www.linux-usb.org/usbnet
6562S: Maintained 6562S: Maintained