Merge branch 'for-v3.18/ti-clk-driver' of github.com:t-kristo/linux-pm into clk-next

diff --cc drivers/clk/ti/clk-dra7-atl.c
Simple merge

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