Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jul 2014 17:02:15 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jul 2014 17:02:15 +0000 (10:02 -0700)
Pull clock driver fix from Mike Turquette:
 "A single patch to re-enable audio which is broken on all DRA7
  SoC-based platforms.  Missed this one from the last set of fixes"

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux:
  clk: ti: clk-7xx: Correct ABE DPLL configuration


Trivial merge