tree c828be96af44cae008f13a4e0d3711643fd20352
parent 3dd9c12726ffd1d548ad5264731dfe7a785768ed
parent f222449c9dfad7c9bb8cb53e64c5c407b172ebbc
author Linus Torvalds <torvalds@linux-foundation.org> 1487467836 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1487467836 -0800

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "Two small fixes::

   - Prevent deadlock on the tick broadcast lock. Found and fixed by
     Mike.

   - Stop using printk() in the timekeeping debug code to prevent a
     deadlock against the scheduler"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Use deferred printk() in debug code
  tick/broadcast: Prevent deadlock on tick_broadcast_lock