From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Mar 2017 20:13:35 +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~5966
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=18f48c9f3c88ec9fbf50c8a193f81969847ebb21;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "Just a simple revert of a new sched_clock implementation which turned
  out to be buggy"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert "clocksource/drivers/tcb_clksrc: Use 32 bit tcb as sched_clock"
---

18f48c9f3c88ec9fbf50c8a193f81969847ebb21