From: Olof Johansson Date: Tue, 28 Jul 2015 10:32:24 +0000 (+0200) Subject: Merge tag 'imx-fixes-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... X-Git-Tag: v4.2-rc5~4^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a7dae1551b55eff5308e5aa0e0149e57533ecb50;p=linux-2.6-block.git Merge tag 'imx-fixes-4.2-2' of git://git./linux/kernel/git/shawnguo/linux into fixes The i.MX fixes for 4.2, 2nd round: - Add the required second clock for i.MX35 FlexCAN in device tree, so that the device can be probed by kernel successfully. * tag 'imx-fixes-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: i.MX35: Fix can support. Signed-off-by: Olof Johansson --- a7dae1551b55eff5308e5aa0e0149e57533ecb50