Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Sat, 1 Aug 2015 00:16:04 +0000 (20:16 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 1 Aug 2015 00:16:04 +0000 (20:16 -0400)

Trivial merge