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