From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 1 Dec 2010 08:18:12 +0000 (+0100)
Subject: Merge branch 'perf/rename' into perf/core
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3d006c0e745bfd2dab4984ffe3279d5cf4e926a;p=linux-beck.git

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>
---

b3d006c0e745bfd2dab4984ffe3279d5cf4e926a
diff --cc tools/perf/command-list.txt
index 949d77fc0b97,949d77fc0b97..16b5088cf8f4
--- a/tools/perf/command-list.txt
+++ b/tools/perf/command-list.txt
@@@ -16,7 -16,7 +16,7 @@@ perf-report			mainporcelain commo
  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