Merge branch 'clocksource/physical-timers' into next/dt
authorOlof Johansson <olof@lixom.net>
Fri, 5 Dec 2014 07:33:16 +0000 (23:33 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 5 Dec 2014 07:33:16 +0000 (23:33 -0800)
commitfb3268b0081e4a9a8baa369b8e882874dcd5f955
treefc576514c1a4e2c520986aaf010c4b09c1d23f15
parent83b63c699b53050a00a3ffb6c43663c4647dac30
parent65b5732d241b8b39e07653794eefffd0d8028cbb
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
drivers/clocksource/arm_arch_timer.c