]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'oprofile/urgent' into oprofile/master
authorRobert Richter <robert.richter@amd.com>
Wed, 7 Dec 2011 17:45:19 +0000 (18:45 +0100)
committerRobert Richter <robert.richter@amd.com>
Wed, 7 Dec 2011 17:45:19 +0000 (18:45 +0100)
1  2 
Documentation/kernel-parameters.txt
arch/s390/oprofile/hwsampler.c
arch/x86/oprofile/nmi_int.c
kernel/events/core.c

Simple merge
Simple merge
Simple merge
Simple merge