Merge branches 'powercap' and 'pm-misc'