| commit | d27c8438eeedb6e1367b592c101e3c87cca0b50f | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Feb 28 13:58:25 2014 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Feb 28 13:58:25 2014 +0100 |
| tree | b67aa6b474fb52a1c88134ba089d034cb10ebc71 | |
| parent | 2b3942e4bb20ef8ef26515bd958c2df83d9a6210 [diff] | |
| parent | bce19369515ff77033d0916cfbc356eca2be9f63 [diff] |
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>