tree 30226e2a49475a59621dfe72b90fd3c1a2ef12ab
parent b25c6cee55c720e5e8502aa37104409aacd16ad3
parent 54d46b7fbcbd00fe4b20a27208e5909facc714e3
author Linus Torvalds <torvalds@linux-foundation.org> 1439575603 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1439575603 -0700

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Ingo Molnar:
 "A single clocksource driver suspend/resume fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clockevents/drivers/sh_cmt: Only perform clocksource suspend/resume if enabled