linux_dsm_epyc7002/net/l2tp
David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-02-23 00:09:14 -05:00
..
Kconfig
l2tp_core.c
l2tp_core.h
l2tp_debugfs.c
l2tp_eth.c
l2tp_ip6.c
l2tp_ip.c
l2tp_netlink.c
l2tp_ppp.c
Makefile