summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/blktrace/blktrace
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-02-01 10:30:29 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-05 09:22:17 +0000
commit80a74318de40be4648d0aa69e1e44db754e5be89 (patch)
tree9e325ad76d29ba728eb998990d72f52c6788ee80 /meta/recipes-kernel/blktrace/blktrace
parent69083a1a1e73333f34b047a73ef5228dcc3384bd (diff)
downloadpoky-80a74318de40be4648d0aa69e1e44db754e5be89.tar.gz
kern-tools: re-enable scc merge command
The ability to merge two branches directly from a .scc file was dropped during the streamlining of the tools. As was pointed out by David Vincent <freesilicon@gmail.com>, there is once again a valid use case for this functionality, so we restore the capability. (From OE-Core rev: a0059ebbb52c659282e355664bba1a2fa282170e) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/blktrace/blktrace')
0 files changed, 0 insertions, 0 deletions