projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fcdb1e c13d38e)
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 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

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
Motorola kernel-slsi