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)
commit89de77a8c557f14d2713a1f43fbc33980e639b98
tree3d7f32120b6b155e3d1374b277a6333cdb9c31cc
parentcb2aa63469f81426c7406227be70b628b42f7a05
parent4a22d9c93af1f2b2c40354c4bc59fd007f33f05e
Merge branch 'clockevents/3.19' of git.linaro.org/people/daniel.lezcano/linux into timers/core

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