Merge branches 'clk-st', 'clk-si' and 'clk-hisilicon' into clk-next