diff options
| author | Ingo Molnar <[email protected]> | 2016-09-05 10:09:59 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-09-05 10:09:59 +0000 |
| commit | 2cc538412a1ca103923ec400a339a5b3833e0280 (patch) | |
| tree | c141b83e1da736c3d069ed491816d0096e1b532a /tools/perf/util/annotate.c | |
| parent | Merge tag 'perf-core-for-mingo-20160823' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | perf/core: Remove WARN from perf_event_read() (diff) | |
| download | kernel-2cc538412a1ca103923ec400a339a5b3833e0280.tar.gz kernel-2cc538412a1ca103923ec400a339a5b3833e0280.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixed and resolve conflicts
Conflicts:
kernel/events/core.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/util/annotate.c')
0 files changed, 0 insertions, 0 deletions