Merge branch 'pm-regulator' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 17:22:21 +0000 (10:22 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 17:22:21 +0000 (10:22 -0700)

Trivial merge