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)
commit853b20396becfe9425f4d5da74e10ea67811b188
tree6cbd5db9ce11677769a34d205a47907a0f2a75a8
parentb335d89cd455ef89c734b9a25de1ab0e745363eb
parentace1297f7222ec5d6a33f41e792a21e999551924
Merge branch 'mmp/dt' into next/pm

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>