Merge branch 'timers/core' into smp/hotplug to pick up dependencies