Conflicts:
	arch/sparc/kernel/perf_event.c

Merge reason: Resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>