Merge commit 'v2.6.34-rc2' into perf/core

author Ingo Molnar <mingo@elte.hu>

Mon, 22 Mar 2010 17:46:57 +0000 (18:46 +0100)

committer Ingo Molnar <mingo@elte.hu>

Mon, 22 Mar 2010 17:47:01 +0000 (18:47 +0100)
author Ingo Molnar <mingo@elte.hu>
Mon, 22 Mar 2010 17:46:57 +0000 (18:46 +0100)
committer Ingo Molnar <mingo@elte.hu>
Mon, 22 Mar 2010 17:47:01 +0000 (18:47 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc tools/perf/perf.c
Simple merge
diff --cc tools/perf/util/hist.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 22 Mar 2010 17:46:57 +0000 (18:46 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 22 Mar 2010 17:47:01 +0000 (18:47 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/perf.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/util/hist.c	patch \|	diff1 \|	diff2 \|	blob \| history