From: Ingo Molnar Date: Thu, 3 Oct 2013 05:55:07 +0000 (+0200) Subject: Merge branch 'clockevents/3.13' of git://git.linaro.org/people/dlezcano/linux into... X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~39^2~11 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68e90740284c69292881cd38c7ece6f09a18a58f;p=pandora-kernel.git Merge branch 'clockevents/3.13' of git://git.linaro.org/people/dlezcano/linux into timers/core Pull (mostly) ARM clocksource driver updates from Daniel Lezcano: " - Soren Brinkmann added FEAT_PERCPU to a clock device when it is local per cpu. This feature prevents the clock framework to choose a per cpu timer as a broadcast timer. This problem arised when the ARM global timer is used when switching to the broadcast timer which is the case now on Xillinx with its cpuidle driver. - Stephen Boyd extended the generic sched_clock code to support 64bit counters and removes the setup_sched_clock deprecation, as that causes lots of warnings since there's still users in the arch/arm tree. He added also the CLOCK_SOURCE_SUSPEND_NONSTOP flag on the architected timer as they continue counting during suspend. - Uwe Kleine-König added some missing __init sections and consolidated the code by moving the of_node_put call from the drivers to the function clocksource_of_init. " Signed-off-by: Ingo Molnar --- 68e90740284c69292881cd38c7ece6f09a18a58f Reading git-diff-tree failed