git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9bf4e7f
6beba7a
)
Merge branch 'perf/core' into perf/probes
author
Ingo Molnar
<mingo@elte.hu>
Fri, 23 Oct 2009 06:23:20 +0000
(08:23 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 23 Oct 2009 06:23:20 +0000
(08:23 +0200)
Conflicts:
tools/perf/Makefile
Merge reason:
- fix the conflict
- pick up the pr_*() infrastructure to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff