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_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
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
l2tp_ip.c
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