From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Aug 2015 14:37:41 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~1246
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f8a89fc05a81d8cae63890e8d52489de8e700fee;p=firefly-linux-kernel-4.4.55.git

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

Pull timer fixes from Thomas Gleixner:
 "Two minimalistic fixes for 4.2 regressions:

   - Eric fixed a thinko in the timer_list base switching code caused by
     the overhaul of the timer wheel.  It can cause a cpu to see the
     wrong base for a timer while we move the timer around.

   - Guenter fixed a regression for IMX if booted w/o device tree, where
     the timer interrupt is not initialized and therefor the machine
     fails to boot"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/imx: Fix boot with non-DT systems
  timer: Write timer->flags atomically
---

f8a89fc05a81d8cae63890e8d52489de8e700fee