Merge branch 'fixes' into arm/soc