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)
No point maintaining two branches for power management

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

Trivial merge