diff options
| author | Ingo Molnar <[email protected]> | 2010-12-01 08:18:12 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2010-12-01 08:22:19 +0000 |
| commit | b3d006c0e745bfd2dab4984ffe3279d5cf4e926a (patch) | |
| tree | 4d1e831872d397cc5bb9cdab6c0e239a0080909c /tools/perf/builtin-annotate.c | |
| parent | perf tools: fix event parsing of comma-separated tracepoint events (diff) | |
| parent | perf: Rename 'perf trace' to 'perf script' (diff) | |
| download | kernel-b3d006c0e745bfd2dab4984ffe3279d5cf4e926a.tar.gz kernel-b3d006c0e745bfd2dab4984ffe3279d5cf4e926a.zip | |
Merge branch 'perf/rename' into perf/core
Merge reason: This is an older commit under testing that was not pushed yet - merge it.
Also fix up the merge in command-list.txt.
Signed-off-by: Ingo Molnar <[email protected]>
Acked-by: Tom Zanussi <[email protected]>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions