diff options
| author | Ingo Molnar <[email protected]> | 2018-03-29 14:03:48 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2018-03-29 14:03:48 +0000 |
| commit | 2d074918fb1568f398777343ff9a28049fb86337 (patch) | |
| tree | 84277c1471f6d575a9515d42a53345666addabc8 /tools/perf/util/annotate.c | |
| parent | Merge tag 'perf-core-for-mingo-4.17-20180328' of git://git.kernel.org/pub/scm... (diff) | |
| parent | perf/hwbp: Simplify the perf-hwbp code, fix documentation (diff) | |
| download | kernel-2d074918fb1568f398777343ff9a28049fb86337.tar.gz kernel-2d074918fb1568f398777343ff9a28049fb86337.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
kernel/events/hw_breakpoint.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/util/annotate.c')
0 files changed, 0 insertions, 0 deletions