]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'oprofile/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 01:34:59 +0000 (12:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 01:34:59 +0000 (12:34 +1100)
1  2 
Documentation/kernel-parameters.txt
arch/x86/oprofile/nmi_int.c
kernel/events/core.c

Simple merge
Simple merge
Simple merge