From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Oct 2013 17:29:25 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~13406
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aff22d3f1a8abef4d28817e0d762b3054e39cf7a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

aff22d3f1a8abef4d28817e0d762b3054e39cf7a