David S. Miller 7e452baf6b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/message/fusion/mptlan.c drivers/net/sfc/ethtool.c net/mac80211/debugfs_sta.c		2008-11-11 15:43:02 -08: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
asix.c	net/usb: add support for Apple USB Ethernet Adapter	2008-05-22 06:19:30 -04:00
catc.c	drivers/net: Kill now superfluous ->last_rx stores.	2008-11-03 21:11:17 -08:00
cdc_ether.c	rndis_host: support WM6 devices as modems	2008-07-22 19:45:49 -04:00
cdc_subset.c	USB: build fix	2008-05-20 14:14:15 -07:00
dm9601.c	dm9601: runtime mac address change support	2008-10-27 15:13:29 -04:00
gl620a.c	Move usbnet.h and rndis_host.h to include/linux/usb	2008-01-31 19:27:00 -08:00
hso.c	[netdrvr] usb/hso: Cleanup rfkill error handling	2008-11-07 03:33:45 -05:00
kaweth.c	USB: remove info() macro from usb network drivers	2008-10-17 14:41:10 -07:00
mcs7830.c	drivers/net: replace __FUNCTION__ with __func__	2008-09-24 18:59:00 -04:00
net1080.c	Move usbnet.h and rndis_host.h to include/linux/usb	2008-01-31 19:27:00 -08:00
pegasus.c	net: convert print_mac to %pM	2008-10-27 17:06:18 -07:00
pegasus.h	Move USB network drivers to drivers/net/usb.	2007-05-09 21:31:55 -04:00
plusb.c	Move usbnet.h and rndis_host.h to include/linux/usb	2008-01-31 19:27:00 -08:00
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	Move usbnet.h and rndis_host.h to include/linux/usb	2008-01-31 19:27:00 -08:00