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)
commit2c49477f2a0fdccfe4765326efa5567c5b259aa1
tree03c03a8b35b019133058a5f00e4b6649b5ada060
parent2aac7ddf9a410e3418c9cc69618f304550466793
parent7196c52c9377df0175b510ff5896bda524f7345e
Merge tag 'imx-clk-fixes-4.6' of git://git./linux/kernel/git/shawnguo/linux into clk-fixes

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