David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-12-17 22:08:28 -05:00

..

af_mpls.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-17 22:08:28 -05:00

internal.h

mpls: support for dead routes

2015-12-03 15:03:27 -05:00

Kconfig

mpls: ip tunnel support

2015-07-21 10:39:05 -07:00

Makefile

mpls: ip tunnel support

2015-07-21 10:39:05 -07:00

mpls_gso.c

net: Add priority to packet_offload objects.

2015-06-01 14:56:09 -07:00

mpls_iptunnel.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-17 22:08:28 -05:00