linux-next: manual merge of the clk tree with the arm-soc tree

Hi all, Today's linux-next merge of the clk tree got a conflict in: drivers/clk/at91/clk-main.c between commit: 99a81706526f ("clk: at91: remo