Merge branch 'mvebu/soc-3xx' into mvebu/soc