From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 28 Feb 2014 12:58:25 +0000 (+0100)
Subject: Merge branch 'timers/core' into sched/idle
X-Git-Tag: firefly_0821_release~176^2~4170^2~5
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d27c8438eeedb6e1367b592c101e3c87cca0b50f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'timers/core' into sched/idle

Avoid heavy conflicts caused by WIP patches in drivers/cpuidle/cpuidle.c,
by merging these into a single base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

d27c8438eeedb6e1367b592c101e3c87cca0b50f