$ 0 0 Hi all, Today's linux-next merge of the clk tree got a conflict in: drivers/clk/sunxi/clk-sun6i-ar100.c between commit: 3ca2377b6fed ("clk: su