tmp_suning_uos_patched/net/l2tp
David S. Miller f6d3125fa3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-02 07:21:25 -07: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_ip.c l2tp: auto load IP modules 2015-09-25 12:27:22 -07:00
l2tp_ip6.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 l2tp: auto load type modules 2015-09-25 12:27:22 -07:00
Makefile