Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Fri, 22 Apr 2016 11:25:18 +0000 (07:25 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 22 Apr 2016 11:25:18 +0000 (07:25 -0400)

Trivial merge