Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
Ingo Molnar [Tue, 20 Dec 2011 11:10:29 +0000 (12:10 +0100)]
1  2 
Documentation/kernel-parameters.txt
arch/s390/oprofile/hwsampler.c

Simple merge
Simple merge