projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b25c6ce 54d46b7)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Aug 2015 18:06:43 +0000 (11:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Aug 2015 18:06:43 +0000 (11:06 -0700)
commit3670901f73e889538a1b8283e8d6eb9962aab410
tree30226e2a49475a59621dfe72b90fd3c1a2ef12abtree | snapshot
parentb25c6cee55c720e5e8502aa37104409aacd16ad3commit | diff
parent54d46b7fbcbd00fe4b20a27208e5909facc714e3commit | diff
Merge branch 'timers-urgent-for-linus' of git://git./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
John Crispins staging tree