Merge branch 'clk-next' into v3.19-rc7

diff --cc MAINTAINERS
index aaa039d,2164026..8fbc5f7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9562,10 -9533,14 +9562,15 @@@ F:   drivers/platform/x86/thinkpad_acpi.
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-pm@vger.kernel.org
 -S:    Supported
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
+ TI CDCE706 CLOCK DRIVER
+ M:    Max Filippov <jcmvbkbc@gmail.com>
+ S:    Maintained
+ F:    drivers/clk/clk-cdce706.c
+ 
  TI CLOCK DRIVER
  M:    Tero Kristo <t-kristo@ti.com>
  L:    linux-omap@vger.kernel.org

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

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

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

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

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

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

diff --cc arch/arm/mach-omap2/prm_common.c
Simple merge