From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 May 2014 05:19:10 +0000 (+0900)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.15-rc6~32
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=95d08585e093a9f07562b4a3984370b4d72f1a57;p=~emulex%2Finfiniband.git

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

Pull timer fix from Thomas Gleixner:
 "A single bug fix for a long standing issue:

   - Updating the expiry value of a relative timer _after_ letting the
     idle logic select a target cpu for the timer based on its stale
     expiry value is outright stupid.  Thanks to Viresh for spotting the
     brainfart"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hrtimer: Set expiry time before switch_hrtimer_base()
---

95d08585e093a9f07562b4a3984370b4d72f1a57