git.openwrt.org Git - openwrt/staging/blogic.git/commit

author	Sjur Brændeland <sjur.brandeland@stericsson.com>
	Thu, 28 Jun 2012 20:36:20 +0000 (20:36 +0000)
committer	David S. Miller <davem@davemloft.net>
	Fri, 29 Jun 2012 07:46:53 +0000 (00:46 -0700)
commit	7fa8ad6df71f4778b23e17b0106aaef02b518684
tree	0a3fceb23fd842e13a81f21b436bc68995467356	tree \| snapshot
parent	3085a4b7d33eb3111244173d1383256e94d249a5	commit \| diff

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>