projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6b16351 b9d18dc)
Merge branch 'imx/cpuidle' into next/pm
authorOlof Johansson <olof@lixom.net>
Sat, 30 Jun 2012 23:13:15 +0000 (16:13 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 30 Jun 2012 23:13:15 +0000 (16:13 -0700)
commit839ab0c18fe4cf83dd99ca814f2b4cf822cd99be
tree868e835a3cee2d3bb5071a0f00eb98bcce8ebdeatree | snapshot
parent6b16351acbd415e66ba16bf7d473ece1574cf0bccommit | diff
parentb9d18dc3a05d59894d60d5e173ebfb89a4b91bdfcommit | 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>
arch/arm/mach-imx/clk-imx51-imx53.c diff1 | diff2 | blob | history
arch/arm/mach-imx/mm-imx5.c diff1 | diff2 | blob | history
arch/arm/plat-mxc/include/mach/common.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.