projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>
1  2 
kernel/time/tick-broadcast.c patch | diff1 | diff2 | blob | history

diff --cc kernel/time/tick-broadcast.c
Simple merge
Linux 6.x block layer and io_uring tree(s)