Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr