]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8946bdf acc9800)
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)
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


Trivial merge
local clone of linux.git