• Olof Johansson's avatar
    Merge branch 'imx/cpuidle' into next/pm · 839ab0c1
    Olof Johansson authored
    * 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: default avatarOlof Johansson <olof@lixom.net>
    839ab0c1
mm-imx5.c 7.13 KB