Merge branch 'perf/core'

author Ingo Molnar <mingo@kernel.org>

Tue, 7 Apr 2015 14:07:05 +0000 (16:07 +0200)

committer Ingo Molnar <mingo@kernel.org>

Tue, 7 Apr 2015 14:07:05 +0000 (16:07 +0200)
author Ingo Molnar <mingo@kernel.org>
Tue, 7 Apr 2015 14:07:05 +0000 (16:07 +0200)
committer Ingo Molnar <mingo@kernel.org>
Tue, 7 Apr 2015 14:07:05 +0000 (16:07 +0200)
diff --cc init/Kconfig
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Apr 2015 14:07:05 +0000 (16:07 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Apr 2015 14:07:05 +0000 (16:07 +0200)
		1	2
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history