Conflicts: kernel/sched.c

Necessary due to the urgent fixes which conflict with the code move
from sched.c to sched_fair.c
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>