Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@elte.hu>
Fri, 7 Nov 2008 09:29:58 +0000 (10:29 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 7 Nov 2008 09:29:58 +0000 (10:29 +0100)
1  2 
arch/x86/Kconfig
kernel/sched.c

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