Merge branch 'for-v3.17/cm-prm-cleanup' of https://github.com/t-kristo/linux-pm into...