David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-09-12 15:52:44 -07:00
..
Kconfig	l2tp: Call udp_sock_create	2014-07-14 16:12:15 -07:00
l2tp_core.c	l2tp: fix use-after-free during module unload	2016-09-02 11:44:44 -07:00
l2tp_core.h	l2tp: use IS_ENABLED() instead of checking for built-in or module	2016-09-10 21:19:11 -07:00
l2tp_debugfs.c	ipv6: make lookups simpler and faster	2013-10-09 00:01:25 -04:00
l2tp_eth.c	l2tp: use IS_ENABLED() instead of checking for built-in or module	2016-09-10 21:19:11 -07:00
l2tp_ip6.c	ipv6: use TOS marks from sockets for routing decision	2016-06-11 15:33:26 -07:00
l2tp_ip.c	ipv4: l2tp: fix a potential issue in l2tp_ip_recv	2016-04-04 16:00:28 -04:00
l2tp_netlink.c	l2tp: make nla_policy const	2016-09-01 14:09:01 -07:00
l2tp_ppp.c	l2tp: use IS_ENABLED() instead of checking for built-in or module	2016-09-10 21:19:11 -07:00
Makefile	l2tp: introduce L2TPv3 IP encapsulation support for IPv6	2012-05-01 09:30:55 -04:00