git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cfb581b
57d5488
)
Merge commit 'v2.6.34-rc1' into perf/urgent
author
Ingo Molnar
<mingo@elte.hu>
Tue, 9 Mar 2010 16:11:53 +0000
(17:11 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 9 Mar 2010 16:11:53 +0000
(17:11 +0100)
Conflicts:
tools/perf/util/probe-event.c
Merge reason: Pick up -rc1 and resolve the conflict as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff