From: Stephen Boyd <sboyd@codeaurora.org>
Date: Wed, 11 May 2016 18:39:17 +0000 (-0700)
Subject: Merge tag 'imx-clk-fixes-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d8609a3a2e4f6fb1fa5cf2468547eb30507e78c4;p=openwrt%2Fstaging%2Fblogic.git

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
---

d8609a3a2e4f6fb1fa5cf2468547eb30507e78c4