diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-10-05 09:47:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-05 09:47:14 +0200 |
| commit | 00e8976200665eec2fa9264d61885b4d1384d4f0 (patch) | |
| tree | 5554648e4411fcd6909214f71370348567cf4b2d /tools/perf/perf-archive.sh | |
| parent | perf_events: Fix invalid pointer when pid is invalid (diff) | |
| parent | perf trace scripting: Fix extern struct definitions (diff) | |
| download | linux-dev-00e8976200665eec2fa9264d61885b4d1384d4f0.tar.xz linux-dev-00e8976200665eec2fa9264d61885b4d1384d4f0.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/ui/browsers/hists.c
Merge reason: fix the conflict and merge in changes for dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/perf-archive.sh')
0 files changed, 0 insertions, 0 deletions