tree b099dece2ff08e57d141af686ffbb24dc663c05b
parent 595bf999e3a864f40e049c67c42ecee50fb7a78a
parent a2b4c607c93a0850c8e3d90688cf3bd08576b986
author Linus Torvalds <torvalds@linux-foundation.org> 1391187771 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1391187771 -0800

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/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()