diff options
| author | Arnaldo Carvalho de Melo <[email protected]> | 2021-04-13 18:14:37 +0000 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2021-04-13 18:14:37 +0000 |
| commit | 473b2922c7e54260268c9bb037d2ff9f327422ab (patch) | |
| tree | 40cee01f50cb0f285399c406ceba7b5acb58e486 /tools/perf/builtin-annotate.c | |
| parent | perf vendor events amd: Add Zen3 events (diff) | |
| parent | Merge tag 'm68knommu-for-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | kernel-473b2922c7e54260268c9bb037d2ff9f327422ab.tar.gz kernel-473b2922c7e54260268c9bb037d2ff9f327422ab.zip | |
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 <[email protected]>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions