Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Mar 2014 22:01:09 +0000 (15:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Mar 2014 22:01:09 +0000 (15:01 -0700)
commit981e893ed537cbaa08f8089d480db4165e6d71c0
treeb0e8f100477be9e25feced30a9c1cbd75e0dc408
parent0f2776e6151a123552fd06b666fe755fa780a967
parentcab5e127eef040399902caa8e1510795583fa03a
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer fix from Ingo Molnar:
 "A late breaking fix from John.  (The bug fixed has a hard lockup
  potential, but that was not observed, warnings were)"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: Revert to calling clock_was_set_delayed() while in irq context