linux/net/l2tp
David S. Miller cba6532100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-04 00:52:29 -04:00
..
Kconfig
l2tp_core.c net: l2tp: fix reversed udp6 checksum flags 2016-05-01 19:32:16 -04:00
l2tp_core.h
l2tp_debugfs.c
l2tp_eth.c
l2tp_ip6.c ipv6: add new struct ipcm6_cookie 2016-05-03 16:08:14 -04:00
l2tp_ip.c
l2tp_netlink.c l2tp: use nla_put_u64_64bit() 2016-04-25 15:09:10 -04:00
l2tp_ppp.c
Makefile