From: Kevin Hilman Date: Mon, 25 Nov 2013 23:54:42 +0000 (-0800) Subject: Merge tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into... X-Git-Tag: v3.13-rc2~26^2~1 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=192b4bcbbe7f226a063c57c82007dbdd31739c54;p=cascardo%2Flinux.git Merge tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes The imx fixes for 3.13, part 2: - Disable S/PDIF "rxtx5" clock option to fix the clocksource breakage introduced by S/PDIF driver * tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: dts: imx6qdl: disable spdif "rxtx5" clock option Signed-off-by: Kevin Hilman Signed-off-by: Olof Johansson --- 192b4bcbbe7f226a063c57c82007dbdd31739c54