tree eb6d09f90c370696dd21f46baf6bdc6d36abb8c1
parent 038485ea9b66858c17f82e5393004532825106a7
parent 7996bad8e62d8ca5888a935185ce313e693814b2
author Olof Johansson <olof@lixom.net> 1325882675 -0800
committer Olof Johansson <olof@lixom.net> 1325882675 -0800

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