summaryrefslogtreecommitdiff
path: root/tools/perf/builtin-annotate.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2021-04-13 15:14:37 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2021-04-13 15:14:37 -0300
commit473b2922c7e54260268c9bb037d2ff9f327422ab (patch)
tree40cee01f50cb0f285399c406ceba7b5acb58e486 /tools/perf/builtin-annotate.c
parentda66658638c947cab0fb157289f03698453ff8d5 (diff)
parent89698becf06d341a700913c3d89ce2a914af69a2 (diff)
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes from perf/urgent that got into upstream. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions