]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
Pick up v3.7-rc2 and fixes before applying more patches.

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

Simple merge
Simple merge
Simple merge