Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 15 Dec 2014 22:13:47 +0000 (17:13 -0500)
committerTom Rini <trini@ti.com>
Mon, 15 Dec 2014 22:13:47 +0000 (17:13 -0500)

Trivial merge