Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 13 Jan 2015 18:39:25 +0000 (13:39 -0500)
committerTom Rini <trini@ti.com>
Tue, 13 Jan 2015 18:39:25 +0000 (13:39 -0500)

Trivial merge