commit | 121711bbe43044ce824922ede472c16540bfbffb | [log] [tgz] |
---|---|---|
author | Arnd Bergmann <arnd@arndb.de> | Mon May 09 16:08:46 2016 +0200 |
committer | Arnd Bergmann <arnd@arndb.de> | Mon May 09 16:08:46 2016 +0200 |
tree | 13fe5eff93f4f18522fbff0256cce32421667e4c | |
parent | 8946bdf7c746c220d1ceb68eb6d2f9e7770d677c [diff] | |
parent | acc98009b87a811f9f815650274a1044474cd167 [diff] |
Merge tag 'imx-soc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc Merge "The i.MX SoC updates for 4.7" from Shawn Guo": - Allow TWD to be used on UP kernel, as the PREEMPT-RT and cyclictest shows that TWD has a slightly better performance than i.MX timer. * tag 'imx-soc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx: always use TWD on IMX6Q