Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Fri, 13 Nov 2015 15:02:43 +0000 (10:02 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 13 Nov 2015 15:02:43 +0000 (10:02 -0500)

Trivial merge