Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

author Ingo Molnar <mingo@elte.hu>

Fri, 24 Sep 2010 07:12:05 +0000 (09:12 +0200)

committer Ingo Molnar <mingo@elte.hu>

Fri, 24 Sep 2010 07:12:05 +0000 (09:12 +0200)
author Ingo Molnar <mingo@elte.hu>
Fri, 24 Sep 2010 07:12:05 +0000 (09:12 +0200)
committer Ingo Molnar <mingo@elte.hu>
Fri, 24 Sep 2010 07:12:05 +0000 (09:12 +0200)
diff --cc Makefile
Simple merge
diff --cc arch/Kconfig
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 24 Sep 2010 07:12:05 +0000 (09:12 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 24 Sep 2010 07:12:05 +0000 (09:12 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history