Merge commit 'v3.1-rc7' into perf/core
Ingo Molnar [Mon, 26 Sep 2011 10:53:42 +0000 (12:53 +0200)]
Merge reason: Pick up the latest upstream fixes.

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

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

Simple merge
Simple merge