Merge with /home/wd/git/u-boot/mailing-list/Haavard_Skinnemoen