summaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/ftrace/samples
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-07 11:17:34 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-07 11:17:34 +0200
commitb7a4abb67416aa07cd65446dd39e64525ccfe8e5 (patch)
tree8f5b0f9ffb617622944b5e6368473f91e3efeaa4 /tools/testing/selftests/ftrace/samples
parentd30323f810e4da94eb75cf4bfe5165b9518c64df (diff)
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff)
downloadblackbird-op-linux-b7a4abb67416aa07cd65446dd39e64525ccfe8e5.tar.gz
blackbird-op-linux-b7a4abb67416aa07cd65446dd39e64525ccfe8e5.zip
Merge 4.0-rc7 into usb-next
We want the fixes in here, and to help resolve merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/ftrace/samples')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud