Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Mon, 23 May 2016 22:32:47 +0000 (18:32 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 23 May 2016 22:32:47 +0000 (18:32 -0400)

Trivial merge