diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 20:58:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 20:58:20 -0800 |
| commit | 053fe57ac249a9531c396175778160d9e9509399 (patch) | |
| tree | 4e4e8acbf0bd01bedef3c733fdd9d7433f0748a0 /MAINTAINERS | |
| parent | 92340ee3198a2afd7664ed2f5472fa072b15fa32 (diff) | |
| parent | 501706565b2d4d2d40d0d301d5411ede099b8a6f (diff) | |
| download | lwn-053fe57ac249a9531c396175778160d9e9509399.tar.gz lwn-053fe57ac249a9531c396175778160d9e9509399.zip | |
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: (75 commits)
net: Handle NETREG_UNINITIALIZED devices correctly
can: add the driver for Analog Devices Blackfin on-chip CAN controllers
xfrm: Fix truncation length of authentication algorithms installed via PF_KEY
net: use compat helper functions in compat_sys_recvmmsg
net: fix compat_sys_recvmmsg parameter type
cxgb3: Fixing EEH handlers
cnic: Zero out status block and Event Queue indices.
cnic: Send delete command when shutting down iSCSI ring.
net: smc91x: Fix up type mismatch in smc_drv_resume().
smc91x: fix unused flags warnings on UP systems
MAINTAINERS: Transfering maintainership of cdc-ether
net: Add missing TST_CFG_WRITE bits around sky2_pci_write
net: Fix Yukon-2 Optima TCP offload setup
net: niu uses crc32, so select CRC32
wireless: update old static regulatory domain rules
mac80211: Revert 'Use correct sign for mesh active path refresh'
mac80211: Fixed bug in mesh portal paths
net/mac80211: Correct size given to memset
b43: Remove reset after fatal DMA error
rtl8187: add radio led and fix warnings on suspend
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 14eab97a86aa..d58fa703ec16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5439,10 +5439,9 @@ S: Supported F: drivers/block/ub.c USB CDC ETHERNET DRIVER -M: Greg Kroah-Hartman <greg@kroah.com> +M: Oliver Neukum <oliver@neukum.name> L: linux-usb@vger.kernel.org S: Maintained -W: http://www.kroah.com/linux-usb/ F: drivers/net/usb/cdc_*.c F: include/linux/usb/cdc.h |