Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Sep 2013 16:24:49 +0000 (11:24 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Sep 2013 16:24:49 +0000 (11:24 -0500)
commit9d2cd7048b1ec21309e2d1a32bf50732eb5d5de8
tree0fd13d51002dc3d0991cb5bdd6e026970171d457
parent7e28b2712e5ebd8d73d25561585bc2ae77da5c30
parent7bd36014460f793c19e7d6c94dab67b0afcfcb7f
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer fix from Ingo Molnar:
 "An NTP related lockup fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Fix HRTICK related deadlock from ntp lock changes