aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/util/annotate-data.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2024-08-16 19:43:16 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2024-08-16 19:43:16 -0300
commit3bce87eb744f1f88523a118e10e0deebf31806ec (patch)
tree02f9090ff510c97ce442a07b807615ad00f1406b /tools/perf/util/annotate-data.c
parent2615639352420e6e3115952c5b8f46846e1c6d0e (diff)
parent85652baa895b59b94bea29c77cb9b51cf7120deb (diff)
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up the latest perf-tools merge for 6.11, i.e. to have the current perf tools branch that is getting into 6.11 with the perf-tools-next that is geared towards 6.12. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate-data.c')
0 files changed, 0 insertions, 0 deletions