Merge commit 'v3.1-rc7' into perf/core

author Ingo Molnar <mingo@elte.hu>

Mon, 26 Sep 2011 10:53:42 +0000 (12:53 +0200)

committer Ingo Molnar <mingo@elte.hu>

Mon, 26 Sep 2011 10:54:28 +0000 (12:54 +0200)
author Ingo Molnar <mingo@elte.hu>
Mon, 26 Sep 2011 10:53:42 +0000 (12:53 +0200)
committer Ingo Molnar <mingo@elte.hu>
Mon, 26 Sep 2011 10:54:28 +0000 (12:54 +0200)
diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge
diff --cc kernel/events/core.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 26 Sep 2011 10:53:42 +0000 (12:53 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 26 Sep 2011 10:54:28 +0000 (12:54 +0200)
		1	2
arch/x86/kernel/cpu/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	patch \|	diff1 \|	diff2 \|	blob \| history