Merge commit 'v3.9-rc5' into next/clk-exynos

Conflicts:
	arch/arm/boot/dts/exynos4.dtsi
	arch/arm/boot/dts/exynos5440.dtsi

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/exynos4.dtsi
index 6252b2c96fa13f8f90829ed4216b67cc5129a5fb,1a62bcf18aa3cb942b4808d02fd007c7b995850b..9ac47d51c40738063aa8ab5e317a9dee43ca3d29
--- 1/arch/arm/boot/dts/exynos4.dtsi
--- 2/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@@ -327,24 -275,27 +327,33 @@@
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0x12680000 0x1000>;
                        interrupts = <0 35 0>;
 +                      clocks = <&clock 292>;
 +                      clock-names = "apb_pclk";
+                       #dma-cells = <1>;
+                       #dma-channels = <8>;
+                       #dma-requests = <32>;
                };
  
                pdma1: pdma@12690000 {
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0x12690000 0x1000>;
                        interrupts = <0 36 0>;
 +                      clocks = <&clock 293>;
 +                      clock-names = "apb_pclk";
+                       #dma-cells = <1>;
+                       #dma-channels = <8>;
+                       #dma-requests = <32>;
                };
  
                mdma1: mdma@12850000 {
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0x12850000 0x1000>;
                        interrupts = <0 34 0>;
 +                      clocks = <&clock 279>;
 +                      clock-names = "apb_pclk";
+                       #dma-cells = <1>;
+                       #dma-channels = <8>;
+                       #dma-requests = <1>;
                };
        };
  };

diff --cc arch/arm/boot/dts/exynos5440.dtsi
index a54c4ab7bdf587f21de800ade4494e5bc4225ea9,9a99755920c04e52f58b29bb5ca684606d6d55e6..c374a31e9c3d59b86dcd79491e655c45499937fb
--- 1/arch/arm/boot/dts/exynos5440.dtsi
--- 2/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@@ -152,16 -142,18 +152,22 @@@
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0x120000 0x1000>;
                        interrupts = <0 34 0>;
 +                      clocks = <&clock 21>;
 +                      clock-names = "apb_pclk";
+                       #dma-cells = <1>;
+                       #dma-channels = <8>;
+                       #dma-requests = <32>;
                };
  
                pdma1: pdma@121B0000 {
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0x121000 0x1000>;
                        interrupts = <0 35 0>;
 +                      clocks = <&clock 21>;
 +                      clock-names = "apb_pclk";
+                       #dma-cells = <1>;
+                       #dma-channels = <8>;
+                       #dma-requests = <32>;
                };
        };
  

diff --cc arch/arm/mach-s5pv210/mach-goni.c
Simple merge