diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-09 23:57:49 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-09 23:57:49 +0200 |
commit | 95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7 (patch) | |
tree | 4a24c1556fd1c52cb4e73eb2eca60de6306e4349 /fs/timerfd.c | |
parent | m32r: make flush_cpumask non-volatile. (diff) | |
parent | clockevents: Shutdown detached clockevent device (diff) | |
download | linux-95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7.tar.xz linux-95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7.zip |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner:
"A simple fix to actually shut down a detached device instead of
keeping it active"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clockevents: Shutdown detached clockevent device
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions