| commit | 192b4bcbbe7f226a063c57c82007dbdd31739c54 | [log] [tgz] |
|---|---|---|
| author | Kevin Hilman <khilman@linaro.org> | Mon Nov 25 15:54:42 2013 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Mon Nov 25 15:55:18 2013 -0800 |
| tree | 168d51ec0aa9bc1fd3d2fd61607c3bd23e849857 | |
| parent | c61248afa8190ae3f47ee67f46e3c9b584a73d31 [diff] | |
| parent | 793b4b10720174b6b27beaf915425248858d7fc5 [diff] |
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 <khilman@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>