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