git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 20 Apr 2019 17:10:49 +0000 (10:10 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 20 Apr 2019 17:10:49 +0000 (10:10 -0700)

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

Trivial merge