tree 20970763d41cf257cd1c6f0ca92ad516ba928286
parent b25c69b9d5e41159b54ad7cb33f7d9ead8523d33
parent 3f2552f7e9c5abef2775c53f7af66532f8bf65bc
author Linus Torvalds <torvalds@linux-foundation.org> 1555780249 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1555780249 -0700

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

Pull timer fixes from Ingo Molnar:
 "Misc clocksource driver fixes, and a sched-clock wrapping fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timers/sched_clock: Prevent generic sched_clock wrap caused by tick_freeze()
  clocksource/drivers/timer-ti-dm: Remove omap_dm_timer_set_load_start
  clocksource/drivers/oxnas: Fix OX820 compatible
  clocksource/drivers/arm_arch_timer: Remove unneeded pr_fmt macro
  clocksource/drivers/npcm: select TIMER_OF