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

Trivial merge