Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@elte.hu>
Mon, 8 Feb 2010 07:55:43 +0000 (08:55 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 8 Feb 2010 07:55:46 +0000 (08:55 +0100)
Merge reason: Merge dependent fix, update to latest -rc.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
Documentation/feature-removal-schedule.txt
include/linux/kernel.h
include/linux/sched.h
init/Kconfig
kernel/sched.c
kernel/sched_fair.c

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