Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...

author Ingo Molnar <mingo@elte.hu>

Tue, 20 Dec 2011 11:10:29 +0000 (12:10 +0100)

committer Ingo Molnar <mingo@elte.hu>

Tue, 20 Dec 2011 11:10:29 +0000 (12:10 +0100)
author Ingo Molnar <mingo@elte.hu>
Tue, 20 Dec 2011 11:10:29 +0000 (12:10 +0100)
committer Ingo Molnar <mingo@elte.hu>
Tue, 20 Dec 2011 11:10:29 +0000 (12:10 +0100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/s390/oprofile/hwsampler.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Tue, 20 Dec 2011 11:10:29 +0000 (12:10 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 20 Dec 2011 11:10:29 +0000 (12:10 +0100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/s390/oprofile/hwsampler.c	patch \|	diff1 \|	diff2 \|	blob \| history