From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Apr 2019 17:10:49 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: microblaze-v5.4-rc1~932
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=e899cc3b3d9813f795c039c0f3c689861d6836da;p=linux-2.6-microblaze.git

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
---

e899cc3b3d9813f795c039c0f3c689861d6836da