Fwd: [git pull] Consolidate cpuidle functionality