diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-01 03:18:12 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-01 03:22:19 -0500 |
| commit | b3d006c0e745bfd2dab4984ffe3279d5cf4e926a (patch) | |
| tree | 4d1e831872d397cc5bb9cdab6c0e239a0080909c /tools/perf/command-list.txt | |
| parent | 4c635a4e04700a371ef7e4d4bb33ed88747e801e (diff) | |
| parent | 133dc4c39c57eeef2577ca5b4ed24765b7a78ce2 (diff) | |
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 <mingo@elte.hu>
Acked-by: Tom Zanussi <tzanussi@gmail.com>
Diffstat (limited to 'tools/perf/command-list.txt')
| -rw-r--r-- | tools/perf/command-list.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/command-list.txt b/tools/perf/command-list.txt index 949d77fc0b97..16b5088cf8f4 100644 --- a/tools/perf/command-list.txt +++ b/tools/perf/command-list.txt | |||
| @@ -16,7 +16,7 @@ perf-report mainporcelain common | |||
| 16 | perf-stat mainporcelain common | 16 | perf-stat mainporcelain common |
| 17 | perf-timechart mainporcelain common | 17 | perf-timechart mainporcelain common |
| 18 | perf-top mainporcelain common | 18 | perf-top mainporcelain common |
| 19 | perf-trace mainporcelain common | 19 | perf-script mainporcelain common |
| 20 | perf-probe mainporcelain common | 20 | perf-probe mainporcelain common |
| 21 | perf-kmem mainporcelain common | 21 | perf-kmem mainporcelain common |
| 22 | perf-lock mainporcelain common | 22 | perf-lock mainporcelain common |