From: Olof Johansson <olof@lixom.net>
Date: Fri, 6 Jan 2012 20:44:35 +0000 (-0800)
Subject: Merge branch 'imx6/pm' into next/pm
X-Git-Tag: firefly_0821_release~3680^2~3789^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6d0a5636fba5a3f82ec80ab124dd4748344549c3;p=firefly-linux-kernel-4.4.55.git

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

6d0a5636fba5a3f82ec80ab124dd4748344549c3