diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2016-05-11 21:39:17 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-05-13 00:48:26 +0300 |
| commit | d8609a3a2e4f6fb1fa5cf2468547eb30507e78c4 (patch) | |
| tree | 27494a2b82d6f2d7a019f67225f5640873163b5e /crypto | |
| parent | 4afe2d1a6ed5cba794aeeaa816e7c97a45167b01 (diff) | |
| parent | 3397c2c45b1b6f54834dfeae30a73046f33ca943 (diff) | |
| download | linux-d8609a3a2e4f6fb1fa5cf2468547eb30507e78c4.tar.xz | |
Merge tag 'imx-clk-fixes-4.6-2' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions