From: Ingo Molnar Date: Tue, 10 Dec 2013 19:47:22 +0000 (+0100) Subject: Merge branch 'clockevents/fixes' of git://git.linaro.org/people/daniel.lezcano/linux... X-Git-Tag: firefly_0821_release~176^2~4761^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d5119a476f77b57381ddd66d4f7034a5447480b;p=firefly-linux-kernel-4.4.55.git Merge branch 'clockevents/fixes' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent Pull clockevents/clocksource fixes from Daniel Lezcano: * Axel Lin added a missing dependency on CLKSRC_MMIO in the Kconfig for the time-efm32 * Dinh Nguyen fixed read_sched_clock to return the right value and added the clksrc-of missing definition for the dw_apb_timer * Ezequiel Garcia registered the sched clock after the counter, thus preventing time jump in the traces for the armada-370-xp * Marc Zyngier stopped the timer before enabling the irq in order to prevent it to be fired before the clockevent is registered for the sunxi * Thierry Reding removed a of_node_put in clksrc-of because the reference is not held Signed-off-by: Ingo Molnar --- 5d5119a476f77b57381ddd66d4f7034a5447480b