tree e46c5f112ba429f836c0c63719b928a8e14fb131
parent 668468b161745df666b75fbfb76d14155b0f9df6
parent 3d85f548d3c84a13dc54cc9c79249c5fdae2ad36
author Tony Lindgren <tony@atomide.com> 1371045635 -0700
committer Tony Lindgren <tony@atomide.com> 1371045635 -0700

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