David S. Miller a1744d3bee Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/p54/p54common.c		2008-10-31 00:17:34 -07:00
..
asix.c	net/usb: add support for Apple USB Ethernet Adapter	2008-05-22 06:19:30 -04:00
catc.c	USB: remove info() macro from usb network drivers	2008-10-17 14:41:10 -07:00
cdc_ether.c	rndis_host: support WM6 devices as modems	2008-07-22 19:45:49 -04:00
cdc_subset.c
dm9601.c	dm9601: runtime mac address change support	2008-10-27 15:13:29 -04:00
gl620a.c
hso.c	[netdrvr] usb/hso: throttle to prevent loss of serial data	2008-09-24 18:58:58 -04:00
kaweth.c	USB: remove info() macro from usb network drivers	2008-10-17 14:41:10 -07:00
Kconfig	net: Add SMSC LAN9500 USB2.0 10/100 ethernet adapter driver	2008-10-08 16:44:18 -07:00
Makefile	drivers/net/usb/Makefile - shrink logspam	2008-10-08 17:07:40 -07:00
mcs7830.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
net1080.c
pegasus.c	net: convert print_mac to %pM	2008-10-27 17:06:18 -07:00
pegasus.h
plusb.c
rndis_host.c	rndis_host: support WM6 devices as modems	2008-07-22 19:45:49 -04:00
rtl8150.c	USB: remove info() macro from usb network drivers	2008-10-17 14:41:10 -07:00
smsc95xx.c	net: convert print_mac to %pM	2008-10-27 17:06:18 -07:00
smsc95xx.h	net: Add SMSC LAN9500 USB2.0 10/100 ethernet adapter driver	2008-10-08 16:44:18 -07:00
usbnet.c	net: convert print_mac to %pM	2008-10-27 17:06:18 -07:00
zaurus.c