Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 May 2015 21:57:49 +0000 (14:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 May 2015 21:57:49 +0000 (14:57 -0700)
commit95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7
tree4a24c1556fd1c52cb4e73eb2eca60de6306e4349
parent1a9f064f516c36d018754407b41921c996439ecf
parent149aabcc44e3e2c1f8fe4f0832be53d2db55b598
Merge branch 'timers-urgent-for-linus' of git://git./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
kernel/time/clockevents.c