Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
	arch/arm/boot/dts/vf610.dtsi

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

diff --cc arch/arm/boot/dts/vf610.dtsi
index 73355ddc51861ced14a605a1f24e08834598e11c,3c91b84066a1bda86c937091a086977a9d89cdbb..6cc314e7b8fb7064af09b3d7d24d6f7ebbba714e
--- 1/arch/arm/boot/dts/vf610.dtsi
--- 2/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@@ -360,17 -347,19 +360,30 @@@
                                status = "disabled";
                        };
  
 +                      esdhc1: esdhc@400b2000 {
 +                              compatible = "fsl,imx53-esdhc";
 +                              reg = <0x400b2000 0x4000>;
 +                              interrupts = <0 28 0x04>;
 +                              clocks = <&clks VF610_CLK_IPG_BUS>,
 +                                      <&clks VF610_CLK_PLATFORM_BUS>,
 +                                      <&clks VF610_CLK_ESDHC1>;
 +                              clock-names = "ipg", "ahb", "per";
 +                              status = "disabled";
 +                      };
 +
+                       ftm: ftm@400b8000 {
+                               compatible = "fsl,ftm-timer";
+                               reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
+                               interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
+                               clock-names = "ftm-evt", "ftm-src",
+                                       "ftm-evt-counter-en", "ftm-src-counter-en";
+                               clocks = <&clks VF610_CLK_FTM2>,
+                                       <&clks VF610_CLK_FTM3>,
+                                       <&clks VF610_CLK_FTM2_EXT_FIX_EN>,
+                                       <&clks VF610_CLK_FTM3_EXT_FIX_EN>;
+                               status = "disabled";
+                       };
+ 
                        fec0: ethernet@400d0000 {
                                compatible = "fsl,mvf600-fec";
                                reg = <0x400d0000 0x1000>;

diff --cc arch/arm/mach-vexpress/Kconfig
Simple merge

diff --cc drivers/clocksource/Kconfig
Simple merge

diff --cc drivers/clocksource/Makefile
Simple merge