projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb2aa63 4a22d9c)
Merge branch 'clockevents/3.19' of http://git.linaro.org/people/daniel.lezcano/linux...
authorThomas Gleixner <tglx@linutronix.de>
Thu, 27 Nov 2014 10:47:10 +0000 (11:47 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 27 Nov 2014 10:47:38 +0000 (11:47 +0100)
Daniel Lezcano muttered:

 * Marvell timer updates from Ezequiel Garcia
   - Add missing clock enable calls for armada
   - Change source clock for clocksource and watchdog
 * SIRF timer updates from Yanchang Li
   - Make clock rate configurable


Trivial merge