linux/drivers/net/usb
David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/chelsio/cxgb4vf/sge.c
	drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

sge.c was overlapping two changes, one to use the new
__dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.

ixgbe_phy.c was a set of overlapping whitespace changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-14 01:01:12 -05:00
..
asix_common.c
asix_devices.c asix: Do full reset during ax88772_bind 2014-11-07 15:30:03 -05:00
asix.h
ax88172a.c
ax88179_178a.c ax88179_178a: fix bonding failure 2014-10-20 00:53:30 -04:00
catc.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
cdc_eem.c
cdc_ether.c cdc-ether: implement MULTICAST flag on the device 2014-11-07 15:17:45 -05:00
cdc_mbim.c net: cdc_ncm/cdc_mbim: adding NCM protocol statistics 2014-05-16 22:39:01 -04:00
cdc_ncm.c net: cdc_ncm: allow tuning min_tx_pkt 2014-06-02 16:01:31 -07:00
cdc_subset.c cdc_subset: deal with a device that needs reset for timeout 2014-08-02 15:44:18 -07:00
cdc-phonet.c phonet: Replace calls to __skb_alloc_page with __dev_alloc_page 2014-11-12 00:00:14 -05:00
cx82310_eth.c
dm9601.c
gl620a.c
hso.c net/usb/hso: Add support for Option GTM671WFS 2014-08-05 13:06:04 -07:00
huawei_cdc_ncm.c net: huawei_cdc_ncm: add "subclass 3" devices 2014-07-17 16:49:50 -07:00
int51x1.c
ipheth.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-03 23:32:12 -07:00
kalmia.c
kaweth.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
Kconfig net: fix USB network driver config option. 2014-08-06 16:00:20 -07:00
lg-vl600.c
Makefile
mcs7830.c
net1080.c
pegasus.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
pegasus.h
plusb.c
qmi_wwan.c net: qmi_wwan: add two Sierra Wireless/Netgear devices 2014-07-17 16:49:50 -07:00
r8152.c r8152: check RTL8152_UNPLUG and netif_running before autoresume 2014-11-12 14:49:08 -05:00
rndis_host.c
rtl8150.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
sierra_net.c
smsc75xx.c
smsc75xx.h
smsc95xx.c usbnet: smsc95xx: dereferencing NULL pointer 2014-11-11 16:24:08 -05:00
smsc95xx.h
sr9700.c
sr9700.h
sr9800.c
sr9800.h
usbnet.c usbnet: add a callback for set_rx_mode 2014-10-28 17:26:19 -04:00
zaurus.c