David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/infiniband/hw/cxgb4/device.c The cxgb4 conflict was simply overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-07-22 00:44:59 -07:00
..
asix.h
asix_common.c
asix_devices.c
ax88172a.c
ax88179_178a.c
catc.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
cdc-phonet.c	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
cdc_eem.c
cdc_ether.c	qmi_wwan/cdc_ether: move Novatel E371 (1410:9011) to qmi_wwan	2014-03-31 16:06:11 -04: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
cx82310_eth.c
dm9601.c
gl620a.c
hso.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-16 14:09:34 -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
lg-vl600.c	lg-vl600: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-16 14:09:34 -07: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: add reset_resume function with reset operation	2014-07-10 00:42:57 -07:00
smsc95xx.h
sr9700.c
sr9700.h
sr9800.c
sr9800.h
usbnet.c	usbnet: include wait queue head in device structure	2014-03-27 14:59:10 -04:00
zaurus.c