Merge back cpuidle material for 5.10.