Merge branch 'dss-regulator' into omap-for-v3.11/fixes-non-critical
authorTony Lindgren <tony@atomide.com>
Wed, 12 Jun 2013 14:00:35 +0000 (07:00 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Jun 2013 14:00:35 +0000 (07:00 -0700)

Trivial merge