Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull clocksource updates from Ingo Molnar:
 "The main change in this tree is the addition of various new SoC
  clocksource/clockevents drivers: Conexant Digicolor SoCs, rockchip
  rk3288 board, asm9260 for MIPS and versatile AB/PB boards"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  dts: versatile: Add sysregs node
  clocksource: versatile: Adapt for Versatile AB and PB boards
  dt/bindings: Add binding for Versatile system registers
  clocksource: Driver for Conexant Digicolor SoC timer
  clocksource: devicetree: Document Conexant Digicolor timer binding
  clockevents: rockchip: Add rockchip timer for rk3288
  ARM: clocksource: Add asm9260_timer driver
  clocksource: marco: Rename marco to atlas7
  clocksource: sirf: Remove unused variable

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/clocksource/Kconfig
index 8a1479fc64793f7d140ee95a64fd3328517a2e32,72a38273f7f50889a1646f6aa897bca8d84a6ed6..717f40e875fcd9957198e164a815229f75dc62a2
--- 1/drivers/clocksource/Kconfig
--- 2/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -229,11 -236,14 +236,21 @@@ config CLKSRC_MIPS_GI
        depends on MIPS_GIC
        select CLKSRC_OF
  
 +config CLKSRC_PXA
 +      def_bool y if ARCH_PXA || ARCH_SA1100
 +      select CLKSRC_OF if USE_OF
 +      help
 +        This enables OST0 support available on PXA and SA-11x0
 +        platforms.
 +
+ config ASM9260_TIMER
+       bool "Alphascale ASM9260 timer driver"
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       select CLKSRC_OF
+       default y if MACH_ASM9260
+       help
+         This enables build of a clocksource and clockevent driver for
+         the 32-bit System Timer hardware available on a Alphascale ASM9260.
+ 
  endmenu

diff --cc drivers/clocksource/Makefile
index aa526f4bd3cfd9749fff71c7073f77280a53d6c8,0f8003d76c32d65b3103199886f8abcdc3ea87a1..3359121570c754d4285c68e655344fcfafadeb6c
--- 1/drivers/clocksource/Makefile
--- 2/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -18,10 -20,10 +20,10 @@@ obj-$(CONFIG_ARMADA_370_XP_TIMER)  += ti
  obj-$(CONFIG_ORION_TIMER)     += time-orion.o
  obj-$(CONFIG_ARCH_BCM2835)    += bcm2835_timer.o
  obj-$(CONFIG_ARCH_CLPS711X)   += clps711x-timer.o
- obj-$(CONFIG_ARCH_MARCO)      += timer-marco.o
+ obj-$(CONFIG_ARCH_ATLAS7)     += timer-atlas7.o
  obj-$(CONFIG_ARCH_MOXART)     += moxart_timer.o
  obj-$(CONFIG_ARCH_MXS)                += mxs_timer.o
 -obj-$(CONFIG_ARCH_PXA)                += pxa_timer.o
 +obj-$(CONFIG_CLKSRC_PXA)      += pxa_timer.o
  obj-$(CONFIG_ARCH_PRIMA2)     += timer-prima2.o
  obj-$(CONFIG_ARCH_U300)               += timer-u300.o
  obj-$(CONFIG_SUN4I_TIMER)     += sun4i_timer.o