git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b9f8fcd
8bea867
)
Merge branch 'linus' into sched/urgent
author
Ingo Molnar
<mingo@elte.hu>
Wed, 16 Dec 2009 17:33:49 +0000
(18:33 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 16 Dec 2009 17:33:49 +0000
(18:33 +0100)
Conflicts:
kernel/sched_idletask.c
Merge reason: resolve the conflicts, pick up latest changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff