diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-30 23:13:15 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-30 23:13:15 (GMT) |
| commit | 839ab0c18fe4cf83dd99ca814f2b4cf822cd99be (patch) | |
| tree | 868e835a3cee2d3bb5071a0f00eb98bcce8ebdea /block/scsi_ioctl.c | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
| parent | b9d18dc3a05d59894d60d5e173ebfb89a4b91bdf (diff) | |
| download | linux-fsl-qoriq-839ab0c18fe4cf83dd99ca814f2b4cf822cd99be.tar.xz | |
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>
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions