Merge branch 'buildman' of git://git.denx.de/u-boot-x86