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)
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

1  2 
drivers/clocksource/arm_arch_timer.c

Simple merge