Merge branch 'for-3.20/soc' into for-3.20/arm64