Merge branch 'timers/vdso' into timers/core

so the hyper-v clocksource update can be applied.