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