• Linus Torvalds's avatar
    Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8c334ce8
    Linus Torvalds authored
    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
    8c334ce8
Makefile 2.36 KB