Merge cpuidle material depended on by the subsequent changes.