Merge branches 'sh/clkfwk' and 'sh/kexec'