git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2526849
a3d3203
)
Merge branch 'linus' into timers/core
author
Ingo Molnar
<mingo@elte.hu>
Mon, 15 Mar 2010 07:17:33 +0000
(08:17 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 15 Mar 2010 07:17:33 +0000
(08:17 +0100)
Conflicts:
Documentation/feature-removal-schedule.txt
Merge reason: Resolve the conflict, update to upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff