Merge branch 'perf/core'

author Ingo Molnar <mingo@kernel.org>

Tue, 19 Feb 2013 07:45:31 +0000 (08:45 +0100)

committer Ingo Molnar <mingo@kernel.org>

Tue, 19 Feb 2013 07:45:31 +0000 (08:45 +0100)
author Ingo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:45:31 +0000 (08:45 +0100)
committer Ingo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:45:31 +0000 (08:45 +0100)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc kernel/events/core.c
Simple merge
diff --cc kernel/trace/trace_clock.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:45:31 +0000 (08:45 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:45:31 +0000 (08:45 +0100)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_clock.c	patch \|	diff1 \|	diff2 \|	blob \| history