Conflicts:
	tools/perf/util/probe-event.c

Merge reason: Pick up -rc1 and resolve the conflict as well.
Signed-off-by: NIngo Molnar <mingo@elte.hu>