Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Thu, 28 Jan 2016 15:07:22 +0000 (10:07 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 28 Jan 2016 15:07:22 +0000 (10:07 -0500)

Trivial merge