Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jul 2012 17:36:02 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jul 2012 17:36:02 +0000 (10:36 -0700)
commit6f7024285864290259d6b4c36f9e84a4b89ec3c4
tree6d6c429ae933289a993030609e2c2bb3627fda4f
parentc1e3209623ccd92f2f391a31ecf3895daa0238f3
parent6b1859dba01c7d512b72d77e3fd7da8354235189
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

One more time/ntp fix pulled from Ingo Molnar.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ntp: Fix STA_INS/DEL clearing bug