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)
commitaff22d3f1a8abef4d28817e0d762b3054e39cf7a
tree0b5adf498a23c98183d904ed57bb858035ad38c1
parente2756f5e0fab825d08dcfbbe6b235166035fa501
parent97b9410643475d6557d2517c2aff9fd2221141a9
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

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