]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b33af5d b208fc5)
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)
commit15199d4bd05edba69ff29b3cb327cdd971924320
treefc576514c1a4e2c520986aaf010c4b09c1d23f15tree | snapshot
parentb33af5dcb2f68949e10c2980fe3aa80d87bc2a9acommit | diff
parentb208fc5922521072ab6580a215beff6598418689commit | diff
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 diff1 | diff2 | blob | history
Linux Kernel Source Tree.