Merge branch 'clk-next-unregister' into clk-next

Conflicts:
	drivers/clk/clk.c