diff options
author | Linus Torvalds | 2017-07-09 11:18:59 -0700 |
---|---|---|
committer | Linus Torvalds | 2017-07-09 11:18:59 -0700 |
commit | 8d97a6c32955103000872663db181b050245eb4d (patch) | |
tree | 10c069ac3bb87dec4e7a6ada1e3c1c49f2981e1b /net/tipc/eth_media.c | |
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 'net/tipc/eth_media.c')
0 files changed, 0 insertions, 0 deletions