Merge branch 'sched/urgent' into sched/core
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>
Showing
想要评论请 注册 或 登录