Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Feb 2016 18:30:14 +0000 (10:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Feb 2016 18:30:14 +0000 (10:30 -0800)
Pull clk fix from Stephen Boyd:
 "One small fix to keep OMAP platforms working across a suspend/resume
  cycle"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: ti: omap3+: dpll: use non-locking version of clk_get_rate


Trivial merge