summaryrefslogtreecommitdiff
path: root/tools/perf/command-list.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-11-17 12:16:43 +0300
committerIngo Molnar <mingo@elte.hu>2009-11-17 12:17:47 +0300
commita7b63425a41cd6a8d50f76fef0660c5110f97e91 (patch)
treebe17ee121f1c8814d8d39c9f3e0205d9397fab54 /tools/perf/command-list.txt
parent35039eb6b199749943547c8572be6604edf00229 (diff)
parent3726cc75e581c157202da93bb2333cce25c15c98 (diff)
downloadlinux-a7b63425a41cd6a8d50f76fef0660c5110f97e91.tar.xz
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.txt2
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 @@
# command name category [deprecated] [common]
#
perf-annotate mainporcelain common
+perf-bench mainporcelain common
+perf-buildid-list mainporcelain common
perf-list mainporcelain common
perf-sched mainporcelain common
perf-record mainporcelain common