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)
commit090ad104c5c59c7952d4b8d4cfb60559b38eb3e0
tree9f5cdb5619ef2040b23acab17c5115c5bb1cbab0
parent24469df4ed8943104980fa7405011870ede8105a
parenteff11ba9ebba475f2aedee74eebc459789f99ab6
Merge branch 'omap/voltage' into next/pm