Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 13 Jan 2015 18:39:25 +0000 (13:39 -0500)
committerTom Rini <trini@ti.com>
Tue, 13 Jan 2015 18:39:25 +0000 (13:39 -0500)
commit5f88ed5cde04612e5b4520327b82d81a3f5493a0
treeae465a7b43e4a01fa4ec774f0199e86743c8d46a
parent95f5c8f2269fc144fba5a21c0e9edf5311007484
parent657e384af630463e3c8c4ffbacd16c5e46aeb0e0
Merge git://git.denx.de/u-boot-x86