Merge branch 'linus' into perf/urgent
Ingo Molnar [Mon, 26 Mar 2012 15:18:44 +0000 (17:18 +0200)]
Merge reason: we need to fix a non-trivial merge conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/x86/kernel/cpu/perf_event.c
include/linux/kernel.h
kernel/events/core.c

Simple merge
Simple merge
Simple merge