]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'ip_tunnel'
authorDavid S. Miller <davem@davemloft.net>
Tue, 1 Oct 2013 16:42:28 +0000 (12:42 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Oct 2013 16:42:28 +0000 (12:42 -0400)
ip_tunnel bug fixes from Steffen Klassert.

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

Trivial merge