Merge branch 'sandbox' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 16 Feb 2015 13:37:22 +0000 (08:37 -0500)
committerTom Rini <trini@ti.com>
Mon, 16 Feb 2015 13:37:22 +0000 (08:37 -0500)

Trivial merge