Merge branch 'timers/nohz' into sched/core
authorIngo Molnar <mingo@kernel.org>
Sat, 5 Jul 2014 09:06:10 +0000 (11:06 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 5 Jul 2014 09:06:10 +0000 (11:06 +0200)
Merge these two, because upcoming patches will touch both areas.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge