Merge branch 'for-tom' of https://github.com/lftan/u-boot