Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 24 Oct 2012 08:20:57 +0000 (10:20 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 24 Oct 2012 08:20:57 +0000 (10:20 +0200)
commitef8c029fa793423439e67ef0416b220d3fa3321a
tree4199cefa6e1dcad1783040755246a14371f029af
parent6fcdb1ed2ef3548d5a9428d6ae60158ddd46a608
parentc13d38e4a1fd5dd07135403c613c8091af444169
Merge branch 'perf/urgent' into perf/core

Pick up v3.7-rc2 and fixes before applying more patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
tools/perf/Makefile
tools/perf/builtin-trace.c
tools/perf/util/thread.c