Merge branch 'for-v3.16/clk-dt' of https://github.com/t-kristo/linux-pm into omap...

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

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

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

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