projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c61248a 793b4b1)
Merge tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorKevin Hilman <khilman@linaro.org>
Mon, 25 Nov 2013 23:54:42 +0000 (15:54 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 25 Nov 2013 23:55:18 +0000 (15:55 -0800)
commit192b4bcbbe7f226a063c57c82007dbdd31739c54
tree168d51ec0aa9bc1fd3d2fd61607c3bd23e849857tree | snapshot (tar.gz zip)
parentc61248afa8190ae3f47ee67f46e3c9b584a73d31commit | diff
parent793b4b10720174b6b27beaf915425248858d7fc5commit | 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>