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