Merge branch 'perf/urgent' into tools/perf/build

author Ingo Molnar <mingo@kernel.org>

Tue, 8 Oct 2013 09:51:31 +0000 (11:51 +0200)

committer Ingo Molnar <mingo@kernel.org>

Tue, 8 Oct 2013 09:51:31 +0000 (11:51 +0200)
author Ingo Molnar <mingo@kernel.org>
Tue, 8 Oct 2013 09:51:31 +0000 (11:51 +0200)
committer Ingo Molnar <mingo@kernel.org>
Tue, 8 Oct 2013 09:51:31 +0000 (11:51 +0200)
diff --cc tools/perf/builtin-stat.c
Simple merge
diff --cc tools/perf/util/session.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 8 Oct 2013 09:51:31 +0000 (11:51 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 8 Oct 2013 09:51:31 +0000 (11:51 +0200)
		1	2
tools/perf/builtin-stat.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/util/session.c	patch \|	diff1 \|	diff2 \|	blob \| history