Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged