Merge branch 'sandbox' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 24 Jun 2014 18:06:22 +0000 (14:06 -0400)
committerTom Rini <trini@ti.com>
Tue, 24 Jun 2014 18:06:22 +0000 (14:06 -0400)

Trivial merge