Conflicts:
	tools/perf/Makefile

Merge reason: resolve the conflict.
Signed-off-by: NIngo Molnar <mingo@elte.hu>