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>