From: David S. Miller <davem@davemloft.net>
Date: Tue, 26 Mar 2013 16:27:27 +0000 (-0400)
Subject: Merge branch 'tunnels'
X-Git-Tag: v3.12-rc1~874^2~340
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbbd136c7dbfe0fba989f337c35f976ef432d1d5;p=kernel%2Fkernel-generic.git

Merge branch 'tunnels'

Pravin B Shelar says:

====================
Following patch series restructure GRE and IPIP tunneling code
to make it modular. It adds ip_tunnel module which acts as
generic tunneling layer which has common code.

These patches do not change any functionality.
v3:v4:
 - Fixed compilation error in ipv6.
 - Few coding style fixes.
v2-v3:
 - Use GPL exports for all export symbols.
 - Set default config NET_IP_TUNNEL to m.
v1-v2:
 - Dropped patch to convert gre_proto_lock to rtnl lock.
====================

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

dbbd136c7dbfe0fba989f337c35f976ef432d1d5