From: Ingo Molnar Date: Sat, 5 Jul 2014 09:06:10 +0000 (+0200) Subject: Merge branch 'timers/nohz' into sched/core X-Git-Tag: v3.17-rc1~134^2~29 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=51da9830d7a58c8f77127c622ee57d453c88af09;p=linux-block.git Merge branch 'timers/nohz' into sched/core Merge these two, because upcoming patches will touch both areas. Signed-off-by: Ingo Molnar --- 51da9830d7a58c8f77127c622ee57d453c88af09