Merge branch 'dss-regulator' into omap-for-v3.11/fixes-non-critical