Merge branch 'mvebu/soc-pmsu' into mvebu/soc