From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 9 May 2016 14:08:46 +0000 (+0200)
Subject: Merge tag 'imx-soc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v4.7-rc1~138^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=121711bbe43044ce824922ede472c16540bfbffb;p=karo-tx-linux.git

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
---

121711bbe43044ce824922ede472c16540bfbffb