Merge branch 'misc' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 23 Sep 2014 14:52:18 +0000 (10:52 -0400)
committerTom Rini <trini@ti.com>
Tue, 23 Sep 2014 14:52:18 +0000 (10:52 -0400)

Trivial merge