From: Stephen Boyd Date: Fri, 15 Apr 2016 22:40:49 +0000 (-0700) Subject: Merge tag 'imx-clk-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c49477f2a0fdccfe4765326efa5567c5b259aa1;p=linux-beck.git Merge tag 'imx-clk-fixes-4.6' of git://git.kernel.org/pub/scm/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 --- 2c49477f2a0fdccfe4765326efa5567c5b259aa1