Merge branch 'next/cpuidle' into next/pm
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:51:51 +0000 (21:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:52:07 +0000 (21:52 +0200)
commitada2e35defe6c6f0a986ec8147e47726fbd0e7b1
tree1dad19377bc12267fba1f8cf8065feb5c00a14e5
parent602b9ba2cb0c62595fa94650f9826ee37f6c633c
parentb9b6b7ae964582ac9cf8dbad9127a4cccfd30751
Merge branch 'next/cpuidle' into next/pm

No point maintaining two branches for power management

Signed-off-by: Arnd Bergmann <arnd@arndb.de>