Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus