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