Merge branches 'pm-cpuidle-fixes' and 'pm-sleep-fixes'