Merge sched/core and timers/core so we can apply the sched balancing patch queue, which depends on both.
