From: Ingo Molnar Date: Fri, 27 Mar 2015 09:09:21 +0000 (+0100) Subject: Merge branch 'timers/core' into perf/timer, to apply dependent patch X-Git-Tag: v5.15~15820^2~58^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e6d7c2aa95158315902647963b359b32da5c295;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'timers/core' into perf/timer, to apply dependent patch An upcoming patch will depend on tai_ns() and NMI-safe ktime_get_raw_fast(), so merge timers/core here in a separate topic branch until it's all cooked and timers/core is merged upstream. Signed-off-by: Ingo Molnar --- 4e6d7c2aa95158315902647963b359b32da5c295