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