Merge branches 'pm-qos' and 'pm-devfreq'