Merge branch 'cpuidle' into release-2.6.27