David S. Miller 2a171788ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Files removed in 'net-next' had their license header updated in 'net'. We take the remove from 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-11-04 09:26:51 +09:00
..
Kconfig	ip_tunnel: fix building with NET_IP_TUNNEL=m	2017-10-12 12:21:11 -07:00
Makefile	mpls: ip tunnel support	2015-07-21 10:39:05 -07:00
af_mpls.c	net: mpls: make function ipgre_mpls_encap_hlen static	2017-10-11 20:19:50 -07:00
internal.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mpls_gso.c	net: mpls: Fixups for GSO	2016-08-30 22:27:18 -07:00
mpls_iptunnel.c	net: Fill in extack for mpls lwt encap	2017-05-30 11:55:32 -04:00