Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jan 2014 17:02:51 +0000 (09:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jan 2014 17:02:51 +0000 (09:02 -0800)
commitaafd9d6a46745926648cb5d0b68b108e79ceb8d4
treeb099dece2ff08e57d141af686ffbb24dc663c05b
parent595bf999e3a864f40e049c67c42ecee50fb7a78a
parenta2b4c607c93a0850c8e3d90688cf3bd08576b986
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer/dynticks updates from Ingo Molnar:
 "This tree contains misc dynticks updates: a fix and three cleanups"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/nohz: Fix overflow error in scheduler_tick_max_deferment()
  nohz_full: fix code style issue of tick_nohz_full_stop_tick
  nohz: Get timekeeping max deferment outside jiffies_lock
  tick: Rename tick_check_idle() to tick_irq_enter()
kernel/sched/core.c
kernel/softirq.c