git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f921281
a0cccc2
)
Merge branch 'perf/live' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 15 Apr 2010 07:13:26 +0000
(09:13 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 15 Apr 2010 07:13:26 +0000
(09:13 +0200)
Conflicts:
tools/perf/builtin-record.c
Merge reason: add the live tracing feature, resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff