kernel-fxtec-pro1x/drivers/net/usb
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
..
asix.c net-next:asix: V2 Update VERSION 2011-11-15 16:26:07 -05:00
catc.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
cdc-phonet.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
cdc_eem.c
cdc_ether.c net/usb: Misc. fixes for the LG-VL600 LTE USB modem 2011-11-14 00:49:05 -05:00
cdc_ncm.c usbnet/cdc_ncm: Don't use stack variables for DMA 2011-08-13 18:00:32 -07:00
cdc_subset.c
cx82310_eth.c
dm9601.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
gl620a.c
hso.c hso: fix a use after free condition 2011-07-08 09:07:59 -07:00
int51x1.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
ipheth.c ipheth: iPhone 4 Verizon CDMA USB Product ID add 2011-09-15 14:49:44 -04:00
kalmia.c drivers/net: static should be at beginning of declaration 2011-07-11 22:15:02 -07:00
kaweth.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
Kconfig MII: fix Kconfig dependencies for MII 2011-09-15 15:49:08 -04:00
lg-vl600.c net/usb: Misc. fixes for the LG-VL600 LTE USB modem 2011-11-14 00:49:05 -05:00
Makefile
mcs7830.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
net1080.c
pegasus.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
pegasus.h
plusb.c
rndis_host.c
rtl8150.c rtl8150: removal of forward declarations. 2011-10-03 14:09:10 -04:00
sierra_net.c
smsc75xx.c net: introduce and use netdev_features_t for device features sets 2011-11-16 17:43:10 -05:00
smsc75xx.h
smsc95xx.c net: introduce and use netdev_features_t for device features sets 2011-11-16 17:43:10 -05:00
smsc95xx.h
usbnet.c usbnet: fix oops in usbnet_start_xmit 2011-11-07 13:25:41 -05:00
zaurus.c usbnet: Remove over-broad module alias from zaurus. 2011-06-29 06:09:17 -07:00