Merge branch 'master' of /home/wd/git/u-boot/master/