Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Wed, 26 Aug 2015 21:48:05 +0000 (17:48 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 26 Aug 2015 21:48:05 +0000 (17:48 -0400)

Trivial merge