Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Wed, 29 Oct 2014 19:57:59 +0000 (15:57 -0400)
committerTom Rini <trini@ti.com>
Wed, 29 Oct 2014 19:57:59 +0000 (15:57 -0400)

Trivial merge