Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Fri, 27 Mar 2015 02:13:11 +0000 (22:13 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 27 Mar 2015 02:13:11 +0000 (22:13 -0400)

Trivial merge