David S. Miller 902455e007 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/core/rtnetlink.c net/core/skbuff.c Both conflicts were very simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-11 16:02:55 -07:00
..
Kconfig	USB2NET: Fix Default to 'y' for SR9800 Device Driver, setting to 'n'	2014-02-13 18:42:01 -05:00
Makefile	r8152: disable the ECM mode	2014-03-05 20:40:24 -05:00
asix.h	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
asix_common.c	usb: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
asix_devices.c	net: asix: add missing flag to struct driver_info	2014-02-14 15:47:43 -05:00
ax88172a.c	usb: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
ax88179_178a.c	USB fixes for 3.14-rc6	2014-03-09 18:59:14 -07:00
catc.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
cdc-phonet.c	net: cdc-phonet: Staticize usbpn_probe	2013-09-20 14:41:02 -04:00
cdc_eem.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
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	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
cx82310_eth.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
dm9601.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-18 00:55:41 -08:00
gl620a.c	usbnet: remove generic hard_header_len check	2014-02-17 14:35:46 -05:00
hso.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
huawei_cdc_ncm.c	net: cdc_ncm: remove redundant "disconnected" flag	2014-05-16 22:39:02 -04:00
int51x1.c	usb: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
ipheth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
kalmia.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
kaweth.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
lg-vl600.c	lg-vl600: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
mcs7830.c	usbnet: remove generic hard_header_len check	2014-02-17 14:35:46 -05:00
net1080.c	usbnet: remove generic hard_header_len check	2014-02-17 14:35:46 -05:00
pegasus.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
pegasus.h	drivers: net: usb: pegasus: fix control urb submission	2013-04-29 13:57:50 -04:00
plusb.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
qmi_wwan.c	net: qmi_wwan: add Olivetti Olicard modems	2014-06-06 16:45:46 -07:00
r8152.c	r8152: Use kmemdup instead of kmalloc + memcpy	2014-05-30 16:25:15 -07:00
rndis_host.c	usbnet: remove generic hard_header_len check	2014-02-17 14:35:46 -05:00
rtl8150.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
sierra_net.c	usb: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
smsc75xx.c	usbnet: remove generic hard_header_len check	2014-02-17 14:35:46 -05:00
smsc75xx.h	usb: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
smsc95xx.c	usbnet: remove generic hard_header_len check	2014-02-17 14:35:46 -05:00
smsc95xx.h	usb: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
sr9700.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
sr9700.h	USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support	2013-09-03 22:26:03 -04:00
sr9800.c	usbnet: remove generic hard_header_len check	2014-02-17 14:35:46 -05:00
sr9800.h	USB2NET : SR9800 : One chip USB2.0 USB2NET SR9800 Device Driver Support	2014-02-10 16:53:06 -08:00
usbnet.c	usbnet: include wait queue head in device structure	2014-03-27 14:59:10 -04:00
zaurus.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00