Merge branch 'core' of git://amd64.org/linux/rric into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)
commitc23205c8488f11cb9ebe7a7b5851a1d8a0171011
tree239dd82daddb1ce08b50ea9145d8f2a4685ebead
parent5d81e5cfb37a174e8ddc0413e2e70cdf05807ace
parentde346b6949063aa040ef607943b072835294f4b3
Merge branch 'core' of git://amd64.org/linux/rric into perf/core
Documentation/kernel-parameters.txt
arch/x86/oprofile/nmi_int.c
kernel/events/core.c