Merge branch 'sched/clock' into tracing/ftrace