Merge branch 'v3.10/topic/mm-timer' into linux-linaro-lsk-v3.10

* v3.10/topic/mm-timer:
  ARM: exynos: dts: Update 5250 arch timer node with clock frequency

arch/arm/boot/dts/exynos5250.dtsi

@@ -89,6 +89,11 @@ timer {
 			     <1 14 0xf08>,
 			     <1 11 0xf08>,
 			     <1 10 0xf08>;
+		/* Unfortunately we need this since some versions of U-Boot
+		 * on Exynos don't set the CNTFRQ register, so we need the
+		 * value from DT.
+		 */
+		clock-frequency = <24000000>;
 	};
 
 	combiner:interrupt-controller@10440000 {