David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-25 20:29:20 -04:00
..
asix_common.c
asix_devices.c
asix.h
ax88172a.c
ax88179_178a.c	USB fixes for 3.14-rc6	2014-03-09 18:59:14 -07:00
catc.c
cdc_eem.c
cdc_ether.c	r8152: disable the ECM mode	2014-03-05 20:40:24 -05:00
cdc_mbim.c
cdc_ncm.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00
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	lg-vl600: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
Makefile	r8152: disable the ECM mode	2014-03-05 20:40:24 -05:00
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	2014-03-14 22:31:55 -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
zaurus.c