git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
35039eb
3726cc7
)
Merge branch 'perf/core' into perf/probes
author
Ingo Molnar
<mingo@elte.hu>
Tue, 17 Nov 2009 09:16:43 +0000
(10:16 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 17 Nov 2009 09:17:47 +0000
(10:17 +0100)
Resolved merge conflict in tools/perf/Makefile
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge