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

..

lmc

…

.gitignore

…

c101.c

…

cosa.c

…

cosa.h

…

dlci.c

net: Fix inconsistent teardown and release of private netdev state.

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

dscc4.c

…

farsync.c

…

farsync.h

…

fsl_ucc_hdlc.c

net/wan/fsl_ucc_hdlc: fix muram allocation error

2017-05-22 12:28:45 -04:00

fsl_ucc_hdlc.h

net/wan/fsl_ucc_hdlc: add hdlc-bus support

2017-05-18 10:28:39 -04:00

hd64570.c

…

hd64570.h

…

hd64572.c

…

hd64572.h

…

hdlc_cisco.c

…

hdlc_fr.c

net: Fix inconsistent teardown and release of private netdev state.

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

hdlc_ppp.c

…

hdlc_raw_eth.c

net: make struct net_device::tx_queue_len unsigned int

2017-05-18 10:19:30 -04:00

hdlc_raw.c

…

hdlc_x25.c

…

hdlc.c

…

hostess_sv11.c

…

ixp4xx_hss.c

…

Kconfig

…

lapbether.c

net: Fix inconsistent teardown and release of private netdev state.

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

Makefile

…

n2.c

…

pc300too.c

…

pci200syn.c

…

sbni.c

…

sbni.h

…

sdla.c

…

sealevel.c

…

slic_ds26522.c

…

slic_ds26522.h

…

wanxl.c

…

wanxl.h

…

wanxlfw.inc_shipped

…

wanxlfw.S

…

x25_asy.c

…

x25_asy.h

…

z85230.c

…

z85230.h

…