David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
Kconfig	l2tp: Call udp_sock_create	2014-07-14 16:12:15 -07:00
Makefile	l2tp: introduce L2TPv3 IP encapsulation support for IPv6	2012-05-01 09:30:55 -04:00
l2tp_core.c	net: l2tp: fix negative assignment to unsigned int	2016-11-09 18:55:36 -05:00
l2tp_core.h	l2tp: use IS_ENABLED() instead of checking for built-in or module	2016-09-10 21:19:11 -07:00
l2tp_debugfs.c	ipv6: make lookups simpler and faster	2013-10-09 00:01:25 -04:00
l2tp_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
l2tp_ip.c	l2tp: fix racy SOCK_ZAPPED flag check in l2tp_ip{,6}_bind()	2016-11-19 22:09:21 -05:00
l2tp_ip6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
l2tp_netlink.c	net: l2tp: cleanup: remove redundant condition	2016-11-09 18:55:36 -05:00
l2tp_ppp.c	net: l2tp: fix negative assignment to unsigned int	2016-11-09 18:55:36 -05:00