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

* clk-composite-unregister:
  clk: composite: Add unregister function

diff --cc drivers/clk/clk-composite.c
Simple merge

diff --cc include/linux/clk-provider.h
Simple merge