Merge remote-tracking branch 'oprofile/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 20 Dec 2011 06:16:27 +0000 (17:16 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 20 Dec 2011 06:16:27 +0000 (17:16 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 06:16:27 +0000 (17:16 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 06:16:27 +0000 (17:16 +1100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc tools/perf/util/header.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 Dec 2011 06:16:27 +0000 (17:16 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 Dec 2011 06:16:27 +0000 (17:16 +1100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/util/header.c	patch \|	diff1 \|	diff2 \|	blob \| history