tree 92d93a3eee5b12d77af3696b9da8026e71df5752
parent 26879da58711aa604a1b866cbeedd7e0f78f90ad
parent 7391daf2ffc780679d6ab3fad1db2619e5dd2c2a
author David S. Miller <davem@davemloft.net> 1462337549 -0400
committer David S. Miller <davem@davemloft.net> 1462337549 -0400

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

Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

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