Merge branch 'sched/urgent'

diff --cc kernel/kthread.c
Simple merge

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

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

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

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

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