Merge branch 'arm/fixes' into arm/soc