| commit | ada2e35defe6c6f0a986ec8147e47726fbd0e7b1 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon May 14 21:51:51 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon May 14 21:52:07 2012 +0200 |
| tree | 1dad19377bc12267fba1f8cf8065feb5c00a14e5 | |
| parent | 602b9ba2cb0c62595fa94650f9826ee37f6c633c [diff] | |
| parent | b9b6b7ae964582ac9cf8dbad9127a4cccfd30751 [diff] |
Merge branch 'next/cpuidle' into next/pm No point maintaining two branches for power management Signed-off-by: Arnd Bergmann <arnd@arndb.de>