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