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: 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

…

l2tp_eth.c

l2tp: auto load type modules

2015-09-25 12:27:22 -07:00

l2tp_ip6.c

inet: create IPv6-equivalent inet_hash function

2016-02-11 03:54:14 -05:00

l2tp_ip.c

l2tp: auto load IP modules

2015-09-25 12:27:22 -07:00

l2tp_netlink.c

l2tp: Fix error creating L2TP tunnels

2016-02-17 15:34:47 -05:00

l2tp_ppp.c

l2tp: rely on ppp layer for skb scrubbing

2016-01-04 16:45:24 -05:00

Makefile

…