diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /tools/perf/command-list.txt | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'tools/perf/command-list.txt')
| -rw-r--r-- | tools/perf/command-list.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/command-list.txt b/tools/perf/command-list.txt index 949d77fc0b97..d695fe40fbff 100644 --- a/tools/perf/command-list.txt +++ b/tools/perf/command-list.txt | |||
| @@ -8,6 +8,7 @@ perf-bench mainporcelain common | |||
| 8 | perf-buildid-cache mainporcelain common | 8 | perf-buildid-cache mainporcelain common |
| 9 | perf-buildid-list mainporcelain common | 9 | perf-buildid-list mainporcelain common |
| 10 | perf-diff mainporcelain common | 10 | perf-diff mainporcelain common |
| 11 | perf-evlist mainporcelain common | ||
| 11 | perf-inject mainporcelain common | 12 | perf-inject mainporcelain common |
| 12 | perf-list mainporcelain common | 13 | perf-list mainporcelain common |
| 13 | perf-sched mainporcelain common | 14 | perf-sched mainporcelain common |
| @@ -16,7 +17,7 @@ perf-report mainporcelain common | |||
| 16 | perf-stat mainporcelain common | 17 | perf-stat mainporcelain common |
| 17 | perf-timechart mainporcelain common | 18 | perf-timechart mainporcelain common |
| 18 | perf-top mainporcelain common | 19 | perf-top mainporcelain common |
| 19 | perf-trace mainporcelain common | 20 | perf-script mainporcelain common |
| 20 | perf-probe mainporcelain common | 21 | perf-probe mainporcelain common |
| 21 | perf-kmem mainporcelain common | 22 | perf-kmem mainporcelain common |
| 22 | perf-lock mainporcelain common | 23 | perf-lock mainporcelain common |