projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5b889f a3ccf63)
Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 15 Oct 2009 06:44:42 +0000 (08:44 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 15 Oct 2009 06:44:44 +0000 (08:44 +0200)
Merge reason: pick up tools/perf/ changes from upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
tools/perf/Makefile patch | diff1 | diff2 | blob | history
tools/perf/builtin-sched.c patch | diff1 | diff2 | blob | history
tools/perf/util/trace-event-parse.c patch | diff1 | diff2 | blob | history

diff --cc tools/perf/Makefile
Simple merge
diff --cc tools/perf/builtin-sched.c
Simple merge
diff --cc tools/perf/util/trace-event-parse.c
Simple merge
John Crispins staging tree