Merge branch 'pm-devfreq' into pm-for-linus