Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing