git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
70a7c12
6e03bb5
)
Merge branch 'perf/urgent' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Sat, 3 Apr 2010 16:17:55 +0000
(18:17 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Sat, 3 Apr 2010 16:17:55 +0000
(18:17 +0200)
Conflicts:
tools/perf/Makefile
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff