David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-06-17 20:20:36 -07:00
..
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
lapb_iface.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
lapb_in.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00
lapb_out.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00
lapb_subr.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00
lapb_timer.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00