From: Sjur Brændeland <sjur.brandeland@stericsson.com>
Date: Thu, 28 Jun 2012 20:36:20 +0000 (+0000)
Subject: caif-hsi: Fix merge issues.
X-Git-Tag: v3.6-rc1~125^2~345
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fa8ad6df71f4778b23e17b0106aaef02b518684;p=pandora-kernel.git

caif-hsi: Fix merge issues.

Fix the failing merge in net-next by reverting the last
net-next merge for caif_hsi.c and then merge in the commit:
"caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost"
from the net repository.

The commit:"caif-hsi: Add missing return in error path" from
net repository was dropped, as it changed code previously removed in the
net-next repository.

Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed