From: Ingo Molnar Date: Thu, 10 Oct 2013 04:25:23 +0000 (+0200) Subject: Merge branch 'fortglx/3.13/time' of git://git.linaro.org/people/jstultz/linux into... X-Git-Tag: firefly_0821_release~176^2~5034^2~9 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a749de5e32d2b72def93f7bd7a2745580d75872;p=firefly-linux-kernel-4.4.55.git Merge branch 'fortglx/3.13/time' of git://git.linaro.org/people/jstultz/linux into timers/core Pull more timekeeping items for v3.13 from John Stultz: * Small cleanup in the clocksource code. * Fix for rtc-pl031 to let it work with alarmtimers. * Move arm64 to using the generic sched_clock framework & resulting cleanup in the generic sched_clock code. Signed-off-by: Ingo Molnar --- 8a749de5e32d2b72def93f7bd7a2745580d75872