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>

diff --cc tools/perf/Makefile
Simple merge

diff --cc tools/perf/builtin-script.c
Simple merge

diff --cc tools/perf/command-list.txt
index 949d77fc0b9718d812a8906883b7a89ef99c49f0,949d77fc0b9718d812a8906883b7a89ef99c49f0..16b5088cf8f4bbb2259aee8ad90483cd926a0935
--- 1/tools/perf/command-list.txt
--- 2/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