Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Fri, 19 Dec 2014 22:09:26 +0000 (17:09 -0500)
committerTom Rini <trini@ti.com>
Fri, 19 Dec 2014 22:09:26 +0000 (17:09 -0500)

Trivial merge