diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-09 11:18:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-09 11:18:59 -0700 |
| commit | 8d97a6c32955103000872663db181b050245eb4d (patch) | |
| tree | 10c069ac3bb87dec4e7a6ada1e3c1c49f2981e1b /include/linux/sched | |
| parent | 4d3c4a42938a23cc826e6e191aaff3567541ad05 (diff) | |
| parent | 86d35afb8e07d99f8bfba4eadf93d918b4741f66 (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timers fixlet from Thomas Gleixner:
"Add Frederic Weisbecker as NOHZ/dyntick maintainer"
[ And an unmentioned and unrelated typo fix in the same commit? Hmm.. ]
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
MAINTAINERS: Add Frederic Weisbecker as nohz/dyntics maintainer
Diffstat (limited to 'include/linux/sched')
| -rw-r--r-- | include/linux/sched/nohz.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched/nohz.h b/include/linux/sched/nohz.h index 7d3f75db23e5..028d17b918a7 100644 --- a/include/linux/sched/nohz.h +++ b/include/linux/sched/nohz.h @@ -2,7 +2,7 @@ #define _LINUX_SCHED_NOHZ_H /* - * This is the interface between the scheduler and nohz/dyntics: + * This is the interface between the scheduler and nohz/dynticks: */ #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON) |