diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-07-05 11:06:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-07-05 11:06:10 +0200 |
| commit | 51da9830d7a58c8f77127c622ee57d453c88af09 (patch) | |
| tree | 85bd2caae0344f77f0afd5f9617a45855000b821 /kernel/itimer.c | |
| parent | 5d5e2b1bcbdc996e72815c03fdc5ea82c4642397 (diff) | |
| parent | d490b3e2c23369c6adfa183d18d9a24ced247797 (diff) | |
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>
Diffstat (limited to 'kernel/itimer.c')
0 files changed, 0 insertions, 0 deletions