Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jan 2018 19:43:42 +0000 (11:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jan 2018 19:43:42 +0000 (11:43 -0800)
Pull timer fix from Thomas Gleixner:
 "A one-liner fix which prevents deferrable timers becoming stale when
  the system does not switch into NOHZ mode"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timers: Unconditionally check deferrable base


Trivial merge