Merge with ssh://fifi/home/wd/git/u-boot/master