David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/renesas/ravb_main.c kernel/bpf/syscall.c net/ipv4/ipmr.c All three conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-03 21:09:12 -05:00
..
Kconfig	l2tp: Call udp_sock_create	2014-07-14 16:12:15 -07:00
l2tp_core.c	l2tp: protect tunnel->del_work by ref_count	2015-09-28 22:39:10 -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	l2tp: auto load type modules	2015-09-25 12:27:22 -07:00
l2tp_ip6.c	ipv6: add complete rcu protection around np->opt	2015-12-02 23:37:16 -05:00
l2tp_ip.c	l2tp: auto load IP modules	2015-09-25 12:27:22 -07:00
l2tp_netlink.c	l2tp: auto load type modules	2015-09-25 12:27:22 -07:00
l2tp_ppp.c	pppox: use standard module auto-loading feature	2015-12-03 15:12:54 -05:00
Makefile	l2tp: introduce L2TPv3 IP encapsulation support for IPv6	2012-05-01 09:30:55 -04:00