diff options
author | Arnd Bergmann | 2012-05-14 21:51:51 +0200 |
---|---|---|
committer | Arnd Bergmann | 2012-05-14 21:52:07 +0200 |
commit | ada2e35defe6c6f0a986ec8147e47726fbd0e7b1 (patch) | |
tree | 1dad19377bc12267fba1f8cf8065feb5c00a14e5 /arch/arm/mach-omap2 | |
parent | Merge branch 'power' of git://github.com/hzhuang1/linux into next/pm (diff) | |
parent | Merge branch 'ux500-cpuidle-for-arm-soc' of git://git.kernel.org/pub/scm/linu... (diff) | |
download | kernel-qcow2-linux-ada2e35defe6c6f0a986ec8147e47726fbd0e7b1.tar.gz kernel-qcow2-linux-ada2e35defe6c6f0a986ec8147e47726fbd0e7b1.tar.xz kernel-qcow2-linux-ada2e35defe6c6f0a986ec8147e47726fbd0e7b1.zip |
Merge branch 'next/cpuidle' into next/pm
No point maintaining two branches for power management
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2')
0 files changed, 0 insertions, 0 deletions