Merge branch 'perf/urgent' into perf/core

author Ingo Molnar <mingo@kernel.org>

Wed, 24 Oct 2012 08:20:57 +0000 (10:20 +0200)

committer Ingo Molnar <mingo@kernel.org>

Wed, 24 Oct 2012 08:20:57 +0000 (10:20 +0200)
author Ingo Molnar <mingo@kernel.org>
Wed, 24 Oct 2012 08:20:57 +0000 (10:20 +0200)
committer Ingo Molnar <mingo@kernel.org>
Wed, 24 Oct 2012 08:20:57 +0000 (10:20 +0200)
diff --cc tools/perf/Makefile
Simple merge
diff --cc tools/perf/builtin-trace.c
Simple merge
diff --cc tools/perf/util/thread.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Wed, 24 Oct 2012 08:20:57 +0000 (10:20 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 24 Oct 2012 08:20:57 +0000 (10:20 +0200)
		1	2
tools/perf/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-trace.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/util/thread.c	patch \|	diff1 \|	diff2 \|	blob \| history