git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 301ba04 0970d29)
Merge branch 'sched/urgent' into sched/core
authorThomas Gleixner <tglx@linutronix.de>
Tue, 16 Feb 2010 15:48:56 +0000 (16:48 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 16 Feb 2010 15:48:56 +0000 (16:48 +0100)
commit6e40f5bbbc734231bc5809d3eb785e3c21f275d7
tree8520fc84d9643502ebe86233cefcd774e2babf72tree | snapshot
parent301ba0457f1ed853fc08e57785f8c87fe7e49c68commit | diff
parent0970d2992dfd7d5ec2c787417cf464f01eeaf42acommit | diff
Merge branch 'sched/urgent' into sched/core

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>
include/linux/sched.h diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
kernel/sched_fair.c diff1 | diff2 | blob | history
Full containers within linux kernel