David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
asix_common.c
asix_devices.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
asix.h
ax88172a.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
ax88179_178a.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
catc.c	net: usb: catc: use new api ethtool_{get|set}_link_ksettings	2017-03-13 15:25:53 -07:00
cdc_eem.c
cdc_ether.c	r8152: The Microsoft Surface docks also use R8152 v2	2017-04-01 12:19:31 -07:00
cdc_mbim.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
cdc_ncm.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
cdc_subset.c
cdc-phonet.c
ch9200.c	ch9200: use skb_cow_head() to deal with cloned skbs	2017-04-21 13:24:06 -04:00
cx82310_eth.c	cx82310_eth: use skb_cow_head() to deal with cloned skbs	2017-04-21 13:24:05 -04:00
dm9601.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
gl620a.c
hso.c	sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>	2017-03-02 08:42:32 +01:00
huawei_cdc_ncm.c
int51x1.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
ipheth.c
kalmia.c	scripts/spelling.txt: add "swith" pattern and fix typo instances	2017-02-27 18:43:46 -08:00
kaweth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
Kconfig	lan78xx: add LAN7801 MAC only support	2016-12-08 14:21:47 -05:00
lan78xx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
lan78xx.h	lan78xx: add LAN7801 MAC only support	2016-12-08 14:21:47 -05:00
lg-vl600.c
Makefile
mcs7830.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
net1080.c
pegasus.c	usbnet: pegasus: Use net_device_stats from struct net_device	2017-04-07 07:03:33 -07:00
pegasus.h	usbnet: pegasus: Use net_device_stats from struct net_device	2017-04-07 07:03:33 -07:00
plusb.c
qmi_wwan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
r8152.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-06 08:24:51 -07:00
rndis_host.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
rtl8150.c	net: usb: rtl8150: use new api ethtool_{get|set}_link_ksettings	2017-03-13 15:25:54 -07:00
sierra_net.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
smsc75xx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
smsc75xx.h
smsc95xx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
smsc95xx.h	smsc95xx: Add comments to the registers definition	2017-04-17 13:04:52 -04:00
sr9700.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
sr9700.h
sr9800.c	net: usbnet: support 64bit stats	2017-04-03 19:09:40 -07:00
sr9800.h
usbnet.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00
zaurus.c