Merge branches 'intel_pstate' and 'pm-sleep'