David S. Miller 3793faad7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts were all overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-06 22:10:13 -07:00
..
af_x25.c	net/x25: fix nonblocking connect	2020-01-09 18:39:33 -08:00
Kconfig	docs: networking: convert x25.txt to ReST	2020-05-01 12:24:40 -07:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sysctl_net_x25.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
x25_dev.c	net/x25: Fix x25_neigh refcnt leak when receiving frame	2020-04-23 15:39:39 -07:00
x25_facilities.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00
x25_forward.c	net: x25: convert to list_for_each_entry_safe()	2020-02-16 18:59:42 -08:00
x25_in.c	net/x25: add new state X25_STATE_5	2019-12-09 10:28:43 -08:00
x25_link.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00
x25_out.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00
x25_proc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00
x25_route.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00
x25_subr.c	net/x25: Fix null-ptr-deref in x25_disconnect	2020-04-28 14:08:59 -07:00
x25_timer.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41	2019-05-24 17:27:12 +02:00