Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap...
authorArnd Bergmann <arnd@arndb.de>
Fri, 30 Sep 2011 20:01:31 +0000 (22:01 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 30 Sep 2011 20:01:31 +0000 (22:01 +0200)

Trivial merge