Merge branches 'pm-avs', 'pm-clk' and 'powercap'