Conflicts:
	tools/perf/Makefile

Merge reason:

 - fix the conflict
 - pick up the pr_*() infrastructure to queue up dependent patch
Signed-off-by: NIngo Molnar <mingo@elte.hu>