Merge branch 'perf/core'

author Ingo Molnar <mingo@kernel.org>

Fri, 24 Aug 2012 10:04:26 +0000 (12:04 +0200)

committer Ingo Molnar <mingo@kernel.org>

Fri, 24 Aug 2012 10:04:26 +0000 (12:04 +0200)
author Ingo Molnar <mingo@kernel.org>
Fri, 24 Aug 2012 10:04:26 +0000 (12:04 +0200)
committer Ingo Molnar <mingo@kernel.org>
Fri, 24 Aug 2012 10:04:26 +0000 (12:04 +0200)
diff --cc Makefile
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Fri, 24 Aug 2012 10:04:26 +0000 (12:04 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 24 Aug 2012 10:04:26 +0000 (12:04 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history