Merge branch 'sh/runtime-pm-misery' into sh-fixes-for-linus