Merge "cpuidle: refactor out cpuidle_enter_state"