Merge with rsync://git-user@source.denx.net/git/u-boot.git