Merge branch 'sched/urgent' into sched/devel
Ingo Molnar [Sun, 20 Jul 2008 09:01:29 +0000 (11:01 +0200)]
1  2 
kernel/sched.c
kernel/sched_fair.c
kernel/sched_rt.c

diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge