Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'