Merge branch 'v3.17-next/power-exynos' into v3.17-next/dt-samsung-2

diff --cc arch/arm/boot/dts/Makefile
Simple merge

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

diff --cc arch/arm/boot/dts/exynos5420.dtsi
index 3d528cffe943116a8a231930005bc03361128987,15957227ffdaafb8679bf675d3c9e966e6d1697e..b69de266101192dde4db72af97cdacc593a1a41c
--- 1/arch/arm/boot/dts/exynos5420.dtsi
--- 2/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@@ -260,8 -260,16 +260,11 @@@
        mfc_pd: power-domain@10044060 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10044060 0x20>;
+               clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MOUT_SW_ACLK333>,
+                       <&clock CLK_MOUT_USER_ACLK333>;
+               clock-names = "oscclk", "pclk0", "clk0";
        };
  
 -      disp_pd: power-domain@100440C0 {
 -              compatible = "samsung,exynos4210-pd";
 -              reg = <0x100440C0 0x20>;
 -      };
 -
        msc_pd: power-domain@10044120 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10044120 0x20>;