Merge branch 'core' of git://amd64.org/linux/rric into perf/core
Ingo Molnar [Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)]
1  2 
Documentation/kernel-parameters.txt
arch/x86/oprofile/nmi_int.c
kernel/events/core.c

Simple merge
Simple merge
Simple merge