Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Tue, 16 Aug 2016 11:58:41 +0000 (07:58 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 16 Aug 2016 11:58:41 +0000 (07:58 -0400)

Trivial merge