Merge branches 'pm-avs' and 'pm-cpuidle'