Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/util/symbol.c

Merge reason: this fix will get merged in .33, not .32, plus
              resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>