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