Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Sun, 12 Jun 2016 13:55:16 +0000 (09:55 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 12 Jun 2016 13:55:16 +0000 (09:55 -0400)

Trivial merge