David S. Miller 9d367eddf3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/ethernet/mellanox/mlxsw/spectrum.h
	drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

The bond_main.c and mellanox switch conflicts were cases of
overlapping changes.

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

2016-01-11 23:55:43 -05:00

..

asix_common.c

asix: silence log message from oversize packet

2015-12-18 16:08:35 -05:00

asix_devices.c

…

asix.h

…

ax88172a.c

mdio: Move allocation of interrupts into core

2016-01-07 14:31:26 -05:00

ax88179_178a.c

…

catc.c

…

cdc_eem.c

…

cdc_ether.c

cdc-acm: fix NULL pointer reference

2016-01-09 21:00:24 -05:00

cdc_mbim.c

net: cdc_ncm: avoid changing RX/TX buffers on MTU changes

2015-12-23 22:52:08 -05:00

cdc_ncm.c

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

2015-12-31 18:20:10 -05:00

cdc_subset.c

…

cdc-phonet.c

…

ch9200.c

…

cx82310_eth.c

…

dm9601.c

…

gl620a.c

…

hso.c

…

huawei_cdc_ncm.c

…

int51x1.c

…

ipheth.c

…

kalmia.c

…

kaweth.c

kaweth: remove ifdefed out call to dma_supported

2015-11-10 16:32:11 -08:00

Kconfig

…

lan78xx.c

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

2016-01-11 23:55:43 -05:00

lan78xx.h

…

lg-vl600.c

…

Makefile

…

mcs7830.c

…

net1080.c

…

pegasus.c

…

pegasus.h

…

plusb.c

…

qmi_wwan.c

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

2016-01-11 23:55:43 -05:00

r8152.c

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

2016-01-11 23:55:43 -05:00

rndis_host.c

…

rtl8150.c

…

sierra_net.c

…

smsc75xx.c

…

smsc75xx.h

…

smsc95xx.c

…

smsc95xx.h

…

sr9700.c

…

sr9700.h

…

sr9800.c

…

sr9800.h

…

usbnet.c

usbnet: allow mini-drivers to consume L2 headers

2015-12-04 16:56:23 -05:00

zaurus.c

…