alistair23-linux/net/l2tp
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
Kconfig net/l2tp: remove depends on CONFIG_EXPERIMENTAL 2013-01-11 11:40:01 -08:00
l2tp_core.c ipv6: make lookups simpler and faster 2013-10-09 00:01:25 -04:00
l2tp_core.h net: misc: Remove extern from function prototypes 2013-10-19 19:12:11 -04: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_ip.c l2tp: close sessions in ip socket destroy callback 2013-03-20 12:10:38 -04:00
l2tp_ip6.c ipv6: make lookups simpler and faster 2013-10-09 00:01:25 -04:00
l2tp_netlink.c ipv6: make lookups simpler and faster 2013-10-09 00:01:25 -04:00
l2tp_ppp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
Makefile l2tp: introduce L2TPv3 IP encapsulation support for IPv6 2012-05-01 09:30:55 -04:00