From: Olof Johansson <olof@lixom.net>
Date: Fri, 5 Dec 2014 07:33:16 +0000 (-0800)
Subject: Merge branch 'clocksource/physical-timers' into next/dt
X-Git-Tag: v3.19-rc1~167^2~2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=fb3268b0081e4a9a8baa369b8e882874dcd5f955

Merge branch 'clocksource/physical-timers' into next/dt

These are a pre-req to get rk3288 SMP to work with some firmwares, so merge
it in here as well as in next/drivers.

* clocksource/physical-timers:
  clocksource: arch_timer: Allow the device tree to specify uninitialized timer registers
  clocksource: arch_timer: Fix code to use physical timers when requested
---

fb3268b0081e4a9a8baa369b8e882874dcd5f955