Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Nov 2009 09:50:39 +0000 (10:50 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Nov 2009 09:50:42 +0000 (10:50 +0100)
Merge reason: Pick up fixes that did not make it into .32.0

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/process_64.c
kernel/sched.c
kernel/sched_fair.c

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