Conflicts:
	tools/perf/util/ui/browsers/hists.c

Merge reason: fix the conflict and merge in changes for dependent patch.
Signed-off-by: NIngo Molnar <mingo@elte.hu>