Merge with pollux.denx.org:/home/git/u-boot/.git