summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorSjur Brændeland <sjur.brandeland@stericsson.com>2012-06-28 22:36:20 +0200
committerDavid S. Miller <davem@davemloft.net>2012-06-29 09:46:53 +0200
commit7fa8ad6df71f4778b23e17b0106aaef02b518684 (patch)
tree0a3fceb23fd842e13a81f21b436bc68995467356 /Documentation
parentipv4: Remove extraneous assignment of dst->tclassid. (diff)
downloadlinux-7fa8ad6df71f4778b23e17b0106aaef02b518684.tar.xz
linux-7fa8ad6df71f4778b23e17b0106aaef02b518684.zip
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 'Documentation')
0 files changed, 0 insertions, 0 deletions