Merge branch 'timers/nohz'

diff --cc arch/x86/kernel/traps.c
Simple merge

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