diff options
| author | Sjur Brændeland <sjur.brandeland@stericsson.com> | 2012-06-28 20:36:20 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-29 07:46:53 (GMT) |
| commit | 7fa8ad6df71f4778b23e17b0106aaef02b518684 (patch) | |
| tree | 0a3fceb23fd842e13a81f21b436bc68995467356 /fs/btrfs/disk-io.h | |
| parent | 3085a4b7d33eb3111244173d1383256e94d249a5 (diff) | |
| download | linux-7fa8ad6df71f4778b23e17b0106aaef02b518684.tar.xz | |
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>
Diffstat (limited to 'fs/btrfs/disk-io.h')
0 files changed, 0 insertions, 0 deletions