David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

2017-06-15 11:59:32 -04: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: usbnet: support 64bit stats

2017-04-03 19:09:40 -07:00

asix.h

net: asix: Add in_pm parameter

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

ax88172a.c

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -07:00

ax88179_178a.c

net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void

2017-06-05 11:00:42 -04: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

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

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

cdc_ether.c

cdc-ether: divorce initialisation with a filter reset and a generic method

2017-05-23 11:01:28 -04:00

cdc_mbim.c

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -07:00

cdc_ncm.c

net: cdc_ncm: Fix TX zero padding

2017-05-08 16:01:10 -04: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: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

ch9200.c

net: ch9200: add missing USB-descriptor endianness conversions

2017-05-12 12:15:46 -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

usbnet: remove generic hard_header_len check

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

hso.c

net: hso: register netdev later to avoid a race condition

2017-04-28 16:11:48 -04: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

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -07: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

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

usb: plusb: Add support for PL-27A1

2017-04-25 10:08:16 -04:00

lan78xx.c

net: phy: Make phy_ethtool_ksettings_get return void

2017-06-13 12:59:06 -04: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

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -07:00

net1080.c

net1080: Remove unused function nc_dump_ttl()

2017-05-18 14:46:07 -04:00

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

usb: plusb: Add support for PL-27A1

2017-04-25 10:08:16 -04:00

qmi_wwan.c

qmi_wwan: new Telewell and Sierra device IDs

2017-06-13 13:20:42 -04:00

r8152.c

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

2017-06-15 11:59:32 -04: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

usb: Fix FSF address in file headers

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

smsc95xx.c

smsc95xx: Support only IPv4 TCP/UDP csum offload

2017-05-21 13:31:48 -04: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

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

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

sr9800.c

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -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/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void

2017-06-05 11:00:42 -04:00

zaurus.c

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

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