]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mmp/dt' into next/pm
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:37:04 +0000 (21:37 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:37:04 +0000 (21:37 +0200)
The mmp power management changes are based on this branch, so pull
it in as a dependency.

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

Trivial merge