Merge branch 'misc' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 6 Jan 2015 01:00:25 +0000 (20:00 -0500)
committerTom Rini <trini@ti.com>
Tue, 6 Jan 2015 01:00:25 +0000 (20:00 -0500)

Trivial merge