Merge tag 'imx-soc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 May 2016 14:08:46 +0000 (16:08 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 9 May 2016 14:08:46 +0000 (16:08 +0200)
commit121711bbe43044ce824922ede472c16540bfbffb
tree13fe5eff93f4f18522fbff0256cce32421667e4c
parent8946bdf7c746c220d1ceb68eb6d2f9e7770d677c
parentacc98009b87a811f9f815650274a1044474cd167
Merge tag 'imx-soc-4.7' of git://git./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