git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3b32fc 906010b)
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 6 Oct 2009 13:02:30 +0000 (15:02 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 6 Oct 2009 13:02:34 +0000 (15:02 +0200)
Merge reason: Upcoming patch is dependent on a fix in perf/urgent.

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

diff --cc tools/perf/Makefile
Simple merge
diff --cc tools/perf/builtin-top.c
Simple merge
diff --cc tools/perf/builtin-trace.c
Simple merge
diff --cc tools/perf/util/symbol.c
Simple merge
Pandora Kernel Repository