From: Olof Johansson Date: Tue, 17 Jan 2017 05:44:56 +0000 (-0800) Subject: Merge tag 'imx-fixes-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu... X-Git-Tag: v4.10-rc5~19^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a11f4706d102ddf82ba38f1db93ac2a61b4685e7;p=karo-tx-linux.git Merge tag 'imx-fixes-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes i.MX fixes for 4.10, 2nd round: - A couple of Nitrogen6 device tree fixes for audio codec probe failure, which is caused by that pinctrl setting for codec clock was not in the correct device node. * tag 'imx-fixes-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx6qdl-nitrogen6_som2: fix sgtl5000 pinctrl init ARM: dts: imx6qdl-nitrogen6_max: fix sgtl5000 pinctrl init Signed-off-by: Olof Johansson --- a11f4706d102ddf82ba38f1db93ac2a61b4685e7