David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ...

Lots of overlapping changes, mostly trivial in nature.

The mlxsw conflict was resolving using the example
resolution at:

https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c

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

2018-08-05 13:04:31 -07:00

..

lmc

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

2018-08-05 13:04:31 -07:00

.gitignore

…

c101.c

…

cosa.c

…

cosa.h

…

dlci.c

…

dscc4.c

…

farsync.c

…

farsync.h

…

fsl_ucc_hdlc.c

wan/fsl_ucc_hdlc: use IS_ERR_VALUE() to check return value of qe_muram_alloc

2018-07-23 11:07:10 -07:00

fsl_ucc_hdlc.h

…

hd64570.c

…

hd64570.h

…

hd64572.c

…

hd64572.h

…

hdlc_cisco.c

…

hdlc_fr.c

…

hdlc_ppp.c

…

hdlc_raw_eth.c

…

hdlc_raw.c

…

hdlc_x25.c

…

hdlc.c

…

hostess_sv11.c

…

ixp4xx_hss.c

…

Kconfig

…

lapbether.c

…

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

…