git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
301ba04
0970d29
)
Merge branch 'sched/urgent' into sched/core
author
Thomas Gleixner
<tglx@linutronix.de>
Tue, 16 Feb 2010 15:48:56 +0000
(16:48 +0100)
committer
Thomas Gleixner
<tglx@linutronix.de>
Tue, 16 Feb 2010 15:48:56 +0000
(16:48 +0100)
Conflicts: kernel/sched.c
Necessary due to the urgent fixes which conflict with the code move
from sched.c to sched_fair.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff