]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'imx6/pm' into next/pm
authorOlof Johansson <olof@lixom.net>
Fri, 6 Jan 2012 20:44:35 +0000 (12:44 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 6 Jan 2012 20:44:35 +0000 (12:44 -0800)
* imx6/pm:
  ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
  ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation


Trivial merge