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)
commit6b34df9e30c8b596f9d0173ca17714076474458e
treea47b26e4ebb4d0aea10b3abbb620efa2a004ba8c
parente58e501a9b3e0db722263b02d6c06f1656a5dee7
parent65b5732d241b8b39e07653794eefffd0d8028cbb
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
drivers/clocksource/arm_arch_timer.c