From: Olof Johansson <olof@lixom.net>
Date: Fri, 5 Dec 2014 07:32:16 +0000 (-0800)
Subject: Merge branch 'clocksource/physical-timers' into next/drivers
X-Git-Tag: firefly_0821_release~176^2~2767^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6b34df9e30c8b596f9d0173ca17714076474458e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'clocksource/physical-timers' into 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
---

6b34df9e30c8b596f9d0173ca17714076474458e