Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Tue, 12 Jul 2016 12:15:17 +0000 (08:15 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 12 Jul 2016 12:15:17 +0000 (08:15 -0400)

Trivial merge