David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-14 22:31:55 -04:00
..
Kconfig	net/l2tp: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:01 -08:00
l2tp_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
l2tp_core.h	l2tp: fix manual sequencing (de)activation in L2TPv2	2014-03-06 14:25:39 -05:00
l2tp_debugfs.c	ipv6: make lookups simpler and faster	2013-10-09 00:01:25 -04:00
l2tp_eth.c	l2tp: fix oops in l2tp_eth_create() error path	2012-11-02 21:56:35 -04:00
l2tp_ip6.c	ipv6: protect protocols not handling ipv4 from v4 connection/bind attempts	2014-01-21 16:59:19 -08:00
l2tp_ip.c	net: add build-time checks for msg->msg_name size	2014-01-18 23:04:16 -08:00
l2tp_netlink.c	l2tp: fix manual sequencing (de)activation in L2TPv2	2014-03-06 14:25:39 -05:00
l2tp_ppp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
Makefile	l2tp: introduce L2TPv3 IP encapsulation support for IPv6	2012-05-01 09:30:55 -04:00