summaryrefslogtreecommitdiff
path: root/tools/perf/command-list.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-12-01 09:18:12 +0100
committerIngo Molnar <mingo@elte.hu>2010-12-01 09:22:19 +0100
commitb3d006c0e745bfd2dab4984ffe3279d5cf4e926a (patch)
tree4d1e831872d397cc5bb9cdab6c0e239a0080909c /tools/perf/command-list.txt
parent4c635a4e04700a371ef7e4d4bb33ed88747e801e (diff)
parent133dc4c39c57eeef2577ca5b4ed24765b7a78ce2 (diff)
downloadlinux-b3d006c0e745bfd2dab4984ffe3279d5cf4e926a.tar.gz
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.txt2
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
perf-stat mainporcelain common
perf-timechart mainporcelain common
perf-top mainporcelain common
-perf-trace mainporcelain common
+perf-script mainporcelain common
perf-probe mainporcelain common
perf-kmem mainporcelain common
perf-lock mainporcelain common