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	the rest of drivers/*: annotate ->poll() instances	2017-11-28 11:06:58 -05:00
cosa.h
dlci.c
dscc4.c
farsync.c	farsync: remove redundant variable txq_length	2018-07-07 20:49:08 +09:00
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	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
hd64572.c
hd64572.h
hdlc_cisco.c
hdlc_fr.c
hdlc_ppp.c	hdlc_ppp: carrier detect ok, don't turn off negotiation	2018-02-26 14:38:12 -05:00
hdlc_raw_eth.c
hdlc_raw.c
hdlc_x25.c
hdlc.c
hostess_sv11.c
ixp4xx_hss.c
Kconfig
lapbether.c	net: lapbether: fix double free	2017-11-01 12:11:02 +09:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
n2.c
pc300too.c
pci200syn.c
sbni.c
sbni.h
sdla.c	drivers/net: wan/sdla: Convert timers to use timer_setup()	2017-10-27 12:09:16 +09:00
sealevel.c
slic_ds26522.c
slic_ds26522.h
wanxl.c	wan: wanxl: remove redundant assignment to stat	2017-11-02 15:48:16 +09:00
wanxl.h
wanxlfw.inc_shipped
wanxlfw.S
x25_asy.c	net: wan: x25_asy: mark expected switch fall-through	2017-11-11 19:10:06 +09:00
x25_asy.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
z85230.c
z85230.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00