Merge branch 'socrates' of /home/wd/git/u-boot/projects