Merge branch 'clk-rockchip' into clk-next

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

diff --cc drivers/clk/rockchip/clk-rk3036.c
Simple merge

diff --cc drivers/clk/rockchip/clk-rk3188.c
Simple merge

diff --cc drivers/clk/rockchip/clk-rk3288.c
Simple merge

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

diff --cc drivers/clk/rockchip/clk.h
Simple merge

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