David S. Miller 87ffabb1f0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

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

2015-04-14 15:44:14 -04:00

..

asix_common.c

…

asix_devices.c

…

asix.h

…

ax88172a.c

…

ax88179_178a.c

…

catc.c

…

cdc_eem.c

…

cdc_ether.c

net/usb/r8152: add device id for Lenovo TP USB 3.0 Ethernet

2015-03-31 17:15:37 -04:00

cdc_mbim.c

…

cdc_ncm.c

…

cdc_subset.c

…

cdc-phonet.c

…

cx82310_eth.c

…

dm9601.c

…

gl620a.c

…

hso.c

…

huawei_cdc_ncm.c

…

int51x1.c

…

ipheth.c

…

kalmia.c

…

kaweth.c

…

Kconfig

…

lg-vl600.c

…

Makefile

…

mcs7830.c

…

net1080.c

…

pegasus.c

…

pegasus.h

…

plusb.c

…

qmi_wwan.c

…

r8152.c

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

2015-04-02 16:16:53 -04: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: rename work handler

2015-04-09 14:37:59 -04:00

zaurus.c

…