Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Apr 2019 17:10:49 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Apr 2019 17:10:49 +0000 (10:10 -0700)
commite899cc3b3d9813f795c039c0f3c689861d6836da
tree20970763d41cf257cd1c6f0ca92ad516ba928286
parentb25c69b9d5e41159b54ad7cb33f7d9ead8523d33
parent3f2552f7e9c5abef2775c53f7af66532f8bf65bc
Merge branch 'timers-urgent-for-linus' of git://git./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