Merge branch 'linus' into timers/ntp