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)
commit9cb17124687026282f93c09a4fd42e0ccd1846ce
treea96c7846cb54cc09410be45bada703e84be9d5fc
parente024bdc051ab99eafb5dd9bad87e79afc27f8a44
parentcfe4a536927c3186b7e7f9be688e7e0f62bb8ea1
Merge branch 'ip_tunnel'

ip_tunnel bug fixes from Steffen Klassert.

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