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)
commit51da9830d7a58c8f77127c622ee57d453c88af09
tree85bd2caae0344f77f0afd5f9617a45855000b821
parent5d5e2b1bcbdc996e72815c03fdc5ea82c4642397
parentd490b3e2c23369c6adfa183d18d9a24ced247797
Merge branch 'timers/nohz' into sched/core

Merge these two, because upcoming patches will touch both areas.

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