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)
commit6d0a5636fba5a3f82ec80ab124dd4748344549c3
treeeb6d09f90c370696dd21f46baf6bdc6d36abb8c1
parent038485ea9b66858c17f82e5393004532825106a7
parent7996bad8e62d8ca5888a935185ce313e693814b2
Merge branch 'imx6/pm' into next/pm

* imx6/pm:
  ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
  ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation