Merge tag 'imx-clk-fixes-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorStephen Boyd <sboyd@codeaurora.org>
Wed, 11 May 2016 18:39:17 +0000 (11:39 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Thu, 12 May 2016 21:48:26 +0000 (14:48 -0700)
commitd8609a3a2e4f6fb1fa5cf2468547eb30507e78c4
tree27494a2b82d6f2d7a019f67225f5640873163b5e
parent4afe2d1a6ed5cba794aeeaa816e7c97a45167b01
parent3397c2c45b1b6f54834dfeae30a73046f33ca943
Merge tag 'imx-clk-fixes-4.6-2' of git://git./linux/kernel/git/shawnguo/linux into clk-next

Pull some non-critical i.MX clk fixes from Shawn Guo:

 * Fix the commit 3713e3f5e927 ("clk: imx35: define two clocks for rtc")
   which messed up the clock enumeration when adding new clock.

* tag 'imx-clk-fixes-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx35: restore existing used clock enumeration
  clk: imx6q: fix typo in CAN clock definition