git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e08643
4464fca
)
Merge branch 'perfcounters/urgent' into perfcounters/core
author
Ingo Molnar
<mingo@elte.hu>
Wed, 19 Aug 2009 12:50:35 +0000
(14:50 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 24 Aug 2009 07:24:01 +0000
(09:24 +0200)
Conflicts:
tools/perf/builtin-annotate.c
tools/perf/builtin-report.c
Merge reason: resolve these conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff