Merge branch 'mvebu/config' into mvebu/for-next