kernel-fxtec-pro1x/drivers/net/usb
David S. Miller 6ab33d5171 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	include/net/mac80211.h
	net/phonet/af_phonet.c
2008-11-20 16:44:00 -08:00
..
asix.c asix: Fix asix-based cards connecting to 10/100Mbs LAN. 2008-11-20 01:48:46 -08: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
dm9601.c dm9601: runtime mac address change support 2008-10-27 15:13:29 -04:00
gl620a.c
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
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 netdevice: safe convert to netdev_priv() #part-3 2008-11-12 23:38:36 -08:00
net1080.c
pegasus.c pegasus: minor resource shrinkage 2008-11-16 00:36:08 -08: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 smsc95xx: add tx checksum offload support 2008-11-20 04:19:21 -08: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