Merge branch 'timers/clockevents' of git://git.linaro.org/people/dlezcano/clockevents...

* New clocksource drivers for ARM SoCs to share

diff --combined drivers/clocksource/Kconfig
index 81465c21f873ec37ec07213b62d81559a24335bf,42c8eccb1e864adfc963a90c54a06382bd57fd6d..b7b9b040a89ba807e36062c2029feedfceee8016
--- 1/drivers/clocksource/Kconfig
--- 2/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -21,12 -21,15 +21,17 @@@ config DW_APB_TIME
  
  config DW_APB_TIMER_OF
        bool
 +      select DW_APB_TIMER
 +      select CLKSRC_OF
  
  config ARMADA_370_XP_TIMER
        bool
  
+ config ORION_TIMER
+       select CLKSRC_OF
+       select CLKSRC_MMIO
+       bool
+ 
  config SUN4I_TIMER
        bool
  
@@@ -69,6 -72,19 +74,19 @@@ config ARM_ARCH_TIME
        bool
        select CLKSRC_OF if OF
  
+ config ARM_GLOBAL_TIMER
+       bool
+       select CLKSRC_OF if OF
+       help
+         This options enables support for the ARM global timer unit
+ 
+ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
+       bool
+       depends on ARM_GLOBAL_TIMER
+       default y
+       help
+        Use ARM global timer clock source as sched_clock
+ 
  config CLKSRC_METAG_GENERIC
        def_bool y if METAG
        help