Conflicts:
	tools/perf/builtin-annotate.c
	tools/perf/builtin-report.c

Merge reason: resolve these conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>