]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e58e501 65b5732)
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 patch | diff1 | diff2 | blob | history

diff --cc drivers/clocksource/arm_arch_timer.c
Simple merge
Michael's Linux tree.