Merge branch 'omap/voltage' into next/pm
authorArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 23:51:09 +0000 (00:51 +0100)
committerArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 23:51:09 +0000 (00:51 +0100)

Trivial merge