Merge branch 'pm-regulator' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 9 Apr 2012 17:28:05 +0000 (10:28 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 9 Apr 2012 17:28:05 +0000 (10:28 -0700)

Trivial merge