git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b01c3a0
e22057c
)
Merge branch 'linus' into perf/urgent
author
Ingo Molnar
<mingo@kernel.org>
Mon, 26 Mar 2012 15:18:44 +0000
(17:18 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Mon, 26 Mar 2012 15:19:03 +0000
(17:19 +0200)
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff