Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Oct 2013 17:29:25 +0000 (10:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Oct 2013 17:29:25 +0000 (10:29 -0700)
Pull timer fix from Ingo Molnar:
 "This tree contains a clockevents regression fix for certain ARM
  subarchitectures"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clockevents: Sanitize ticks to nsec conversion


Trivial merge