David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-30 00:54:02 -04:00
..
Kconfig	l2tp: Call udp_sock_create	2014-07-14 16:12:15 -07:00
l2tp_core.c	l2tp: fix configuration passed to setup_udp_tunnel_sock()	2016-06-08 11:11:53 -07:00
l2tp_core.h	l2tp: auto load type modules	2015-09-25 12:27:22 -07:00
l2tp_debugfs.c	ipv6: make lookups simpler and faster	2013-10-09 00:01:25 -04:00
l2tp_eth.c	net: add netdev_lockdep_set_classes() helper	2016-06-09 13:28:37 -07:00
l2tp_ip6.c	ipv6: use TOS marks from sockets for routing decision	2016-06-11 15:33:26 -07:00
l2tp_ip.c	ipv4: l2tp: fix a potential issue in l2tp_ip_recv	2016-04-04 16:00:28 -04:00
l2tp_netlink.c	l2tp: use nla_put_u64_64bit()	2016-04-25 15:09:10 -04:00
l2tp_ppp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-30 00:54:02 -04:00
Makefile	l2tp: introduce L2TPv3 IP encapsulation support for IPv6	2012-05-01 09:30:55 -04:00