From: Ingo Molnar Date: Fri, 28 Feb 2014 12:58:25 +0000 (+0100) Subject: Merge branch 'timers/core' into sched/idle X-Git-Tag: next-20140306~34^2~12^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d27c8438eeedb6e1367b592c101e3c87cca0b50f;p=karo-tx-linux.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 --- d27c8438eeedb6e1367b592c101e3c87cca0b50f