Merge branch 'for-arm-soc' into for-next