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

diff --cc arch/arm/boot/dts/dra7xx-clocks.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap54xx-clocks.dtsi
Simple merge

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