From: David S. Miller <davem@davemloft.net>
Date: Mon, 3 Nov 2014 19:27:12 +0000 (-0500)
Subject: Merge branch 'tun-net'
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~119^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b11e6788155a368c0436d7d8cd383badb2c8151;p=pandora-kernel.git

Merge branch 'tun-net'

Herbert Xu says:

====================
tun: Fix csum_start and TUN_PKT_STRIP

The first patch fixes a serious problem that breaks checksum offload
in VMs while the second patch fixes a problem that probably affects
no one.
====================

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

2b11e6788155a368c0436d7d8cd383badb2c8151