tree b67aa6b474fb52a1c88134ba089d034cb10ebc71
parent 2b3942e4bb20ef8ef26515bd958c2df83d9a6210
parent bce19369515ff77033d0916cfbc356eca2be9f63
author Ingo Molnar <mingo@kernel.org> 1393592305 +0100
committer Ingo Molnar <mingo@kernel.org> 1393592305 +0100

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>