diff options
| author | Ingo Molnar <[email protected]> | 2010-04-02 17:37:50 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2010-04-02 17:38:10 +0000 |
| commit | ec5e61aabeac58670691bd0613388d16697d0d81 (patch) | |
| tree | 59838509358f27334874b90756505785cde29b02 /tools/perf/scripts/python/check-perf-trace.py | |
| parent | perf probe: Fix to close dwarf when failing to analyze it (diff) | |
| parent | perf: Fix 'perf sched record' deadlock (diff) | |
| download | kernel-ec5e61aabeac58670691bd0613388d16697d0d81.tar.gz kernel-ec5e61aabeac58670691bd0613388d16697d0d81.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/cpu/perf_event.c
Merge reason: Resolve the conflict, pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/check-perf-trace.py')
0 files changed, 0 insertions, 0 deletions