Merge branch 'tom' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 8 Jul 2014 00:45:09 +0000 (20:45 -0400)
committerTom Rini <trini@ti.com>
Tue, 8 Jul 2014 00:45:09 +0000 (20:45 -0400)

Trivial merge