projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b3942e bce1936)
Merge branch 'timers/core' into sched/idle
authorIngo Molnar <mingo@kernel.org>
Fri, 28 Feb 2014 12:58:25 +0000 (13:58 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 28 Feb 2014 12:58:25 +0000 (13:58 +0100)
commitd27c8438eeedb6e1367b592c101e3c87cca0b50f
treeb67aa6b474fb52a1c88134ba089d034cb10ebc71tree | snapshot (tar.gz zip)
parent2b3942e4bb20ef8ef26515bd958c2df83d9a6210commit | diff
parentbce19369515ff77033d0916cfbc356eca2be9f63commit | 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>
kernel/time/tick-broadcast.c diff1 | diff2 | blob | history