Merge tag 'imx-clk-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng...
authorStephen Boyd <sboyd@codeaurora.org>
Fri, 15 Apr 2016 22:40:49 +0000 (15:40 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Fri, 15 Apr 2016 22:40:49 +0000 (15:40 -0700)
The i.MX clk fixes for 4.6:
 - Fix the typo in CAN clock definition which is introduced by commit
   ee36027427c7 ("clk: imx: Add clock support for imx6qp")

* tag 'imx-clk-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  clk: imx6q: fix typo in CAN clock definition


Trivial merge