David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-02-07 16:29:30 -05:00

..

asix_common.c

net: asix: Avoid looping when the device does not respond

2016-10-14 16:06:54 -04:00

asix_devices.c

net: usb: asix_devices: add .reset_resume for USB PM

2017-01-04 13:03:08 -05:00

asix.h

net: asix: Add in_pm parameter

2016-08-31 21:07:05 -07:00

ax88172a.c

net: usb: ax88172x: Utilize phy_ethtool_nway_reset

2016-11-15 16:33:35 -05:00

ax88179_178a.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-11-15 10:54:36 -05:00

catc.c

catc: Use heap buffer for memory size test

2017-02-07 10:07:02 -05: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-01-28 10:33:06 -05:00

cdc_mbim.c

NET: usb: cdc_mbim: add quirk for supporting Telit LE922A

2016-12-08 13:02:25 -05:00

cdc_ncm.c

ktime: Cleanup ktime_set() usage

2016-12-25 17:21:22 +01: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

net: use core MTU range checking in USB NIC drivers

2016-10-20 14:51:08 -04:00

ch9200.c

net: usb: ch9200: use kmemdup

2016-05-20 19:50:07 -04:00

cx82310_eth.c

cx82310_eth: fix semicolon.cocci warnings

2015-03-24 14:56:02 -04:00

dm9601.c

drivers/net: get rid of unnecessary initializations in .get_drvinfo()

2015-10-16 00:24:10 -07:00

gl620a.c

usbnet: remove generic hard_header_len check

2014-02-17 14:35:46 -05:00

hso.c

hso: Convert printk to pr_<level>

2016-09-06 13:29:51 -07:00

huawei_cdc_ncm.c

cdc_ncm: Add support for moving NDP to end of NCM frame

2015-07-09 14:58:31 -07: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

kalmia: avoid potential uninitialized variable use

2016-10-27 16:27:34 -04:00

kaweth.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

Kconfig

lan78xx: add LAN7801 MAC only support

2016-12-08 14:21:47 -05:00

lan78xx.c

lan78xx: add LAN7801 MAC only support

2016-12-08 14:21:47 -05:00

lan78xx.h

lan78xx: add LAN7801 MAC only support

2016-12-08 14:21:47 -05:00

lg-vl600.c

net: usb: Use eth_<foo>_addr instead of memset

2015-03-03 17:01:36 -05:00

Makefile

USB: cdc_subset: only build when one driver is enabled

2016-02-18 15:59:45 -05:00

mcs7830.c

drivers/net: get rid of unnecessary initializations in .get_drvinfo()

2015-10-16 00:24:10 -07:00

net1080.c

usbnet: remove generic hard_header_len check

2014-02-17 14:35:46 -05:00

pegasus.c

pegasus: Use heap buffers for all register access

2017-02-07 10:07:01 -05:00

pegasus.h

drivers: net: usb: pegasus: fix control urb submission

2013-04-29 13:57:50 -04:00

plusb.c

drivers/net/usb/plusb.c: Fix typo

2016-03-27 22:33:56 -04:00

qmi_wwan.c

qmi_wwan/cdc_ether: add device ID for HP lt2523 (Novatel E371) WWAN card

2017-01-24 15:25:00 -05:00

r8152.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-01-28 10:33:06 -05:00

rndis_host.c

rndis_host: Set valid random MAC on buggy devices

2016-07-16 20:03:04 -07:00

rtl8150.c

rtl8150: Use heap buffers for all register access

2017-02-07 10:07:02 -05:00

sierra_net.c

net: use core MTU range checking in USB NIC drivers

2016-10-20 14:51:08 -04:00

smsc75xx.c

net: use core MTU range checking in USB NIC drivers

2016-10-20 14:51:08 -04:00

smsc75xx.h

usb: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

smsc95xx.c

smsc95xx: Add mdix control via ethtool

2016-09-06 13:28:10 -07:00

smsc95xx.h

smsc95xx: Add register define

2016-09-06 13:28:10 -07:00

sr9700.c

net: usb: sr9700: Use 'SR_' prefix for the common register macros

2015-02-04 13:53:02 -08:00

sr9700.h

net: usb: sr9700: Use 'SR_' prefix for the common register macros

2015-02-04 13:53:02 -08:00

sr9800.c

drivers/net: get rid of unnecessary initializations in .get_drvinfo()

2015-10-16 00:24:10 -07:00

sr9800.h

USB2NET : SR9800 : One chip USB2.0 USB2NET SR9800 Device Driver Support

2014-02-10 16:53:06 -08:00

usbnet.c

net: use core MTU range checking in USB NIC drivers

2016-10-20 14:51:08 -04:00

zaurus.c

drivers/net: delete non-required instances of include <linux/init.h>

2014-01-16 11:53:26 -08:00