Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.
Signed-off-by: NIngo Molnar <mingo@elte.hu>