From: Olof Johansson <olof@lixom.net>
Date: Sat, 30 Jun 2012 23:13:15 +0000 (-0700)
Subject: Merge branch 'imx/cpuidle' into next/pm
X-Git-Tag: v3.6-rc1~135^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=839ab0c18fe4cf83dd99ca814f2b4cf822cd99be;p=pandora-kernel.git

Merge branch 'imx/cpuidle' into next/pm

* imx/cpuidle:
  ARM: imx: Add imx6q cpuidle driver
  ARM: imx: Add imx5 cpuidle
  ARM: imx: Add common imx cpuidle init functionality.
  ARM: imx: Enable imx53 low power idle
  ARM: imx: clean and consolidate imx5 suspend and idle code
  ARM: imx: Add comments to tzic_enable_waker()
  ARM: imx: Modify IMX_IO_P2V macro

Resolved trivial context conflict in arch/arm/plat-mxc/include/mach/common.h

Signed-off-by: Olof Johansson <olof@lixom.net>
---

839ab0c18fe4cf83dd99ca814f2b4cf822cd99be
Reading git-diff-tree failed