Merge branch 'core' of git://amd64.org/linux/rric into perf/core

author Ingo Molnar <mingo@elte.hu>

Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)

committer Ingo Molnar <mingo@elte.hu>

Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)
author Ingo Molnar <mingo@elte.hu>
Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)
committer Ingo Molnar <mingo@elte.hu>
Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/x86/oprofile/nmi_int.c
Simple merge
diff --cc kernel/events/core.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/oprofile/nmi_int.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	patch \|	diff1 \|	diff2 \|	blob \| history