Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap...
authorTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:14:33 +0000 (16:14 -0700)

Trivial merge