| commit | 839ab0c18fe4cf83dd99ca814f2b4cf822cd99be | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Jun 30 16:13:15 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sat Jun 30 16:13:15 2012 -0700 |
| tree | 868e835a3cee2d3bb5071a0f00eb98bcce8ebdea | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc [diff] | |
| parent | b9d18dc3a05d59894d60d5e173ebfb89a4b91bdf [diff] |
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>