Merge branch 'cpuidle-perf-events' into idle-test