diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-05 12:09:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-05 12:09:59 +0200 |
| commit | 2cc538412a1ca103923ec400a339a5b3833e0280 (patch) | |
| tree | c141b83e1da736c3d069ed491816d0096e1b532a /tools/perf/scripts/python | |
| 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 | linux-2cc538412a1ca103923ec400a339a5b3833e0280.tar.gz linux-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 <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions