diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-17 04:16:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-17 04:17:47 -0500 |
| commit | a7b63425a41cd6a8d50f76fef0660c5110f97e91 (patch) | |
| tree | be17ee121f1c8814d8d39c9f3e0205d9397fab54 /tools/perf/command-list.txt | |
| parent | 35039eb6b199749943547c8572be6604edf00229 (diff) | |
| parent | 3726cc75e581c157202da93bb2333cce25c15c98 (diff) | |
Merge branch 'perf/core' into perf/probes
Resolved merge conflict in tools/perf/Makefile
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/command-list.txt')
| -rw-r--r-- | tools/perf/command-list.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/command-list.txt b/tools/perf/command-list.txt index 6475db4f194c..d3a6e18e4a5e 100644 --- a/tools/perf/command-list.txt +++ b/tools/perf/command-list.txt | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | # command name category [deprecated] [common] | 3 | # command name category [deprecated] [common] |
| 4 | # | 4 | # |
| 5 | perf-annotate mainporcelain common | 5 | perf-annotate mainporcelain common |
| 6 | perf-bench mainporcelain common | ||
| 7 | perf-buildid-list mainporcelain common | ||
| 6 | perf-list mainporcelain common | 8 | perf-list mainporcelain common |
| 7 | perf-sched mainporcelain common | 9 | perf-sched mainporcelain common |
| 8 | perf-record mainporcelain common | 10 | perf-record mainporcelain common |