Merge branch 'sched/rt' into sched/core
authorIngo Molnar <mingo@elte.hu>
Mon, 24 Nov 2008 16:37:12 +0000 (17:37 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 24 Nov 2008 16:37:12 +0000 (17:37 +0100)
1  2 
include/linux/sched.h
kernel/sched.c

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