Merge branch 'pm-regulator' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 20 Apr 2012 00:19:32 +0000 (17:19 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 20 Apr 2012 00:19:32 +0000 (17:19 -0700)

Trivial merge