Merge branch 'buildman' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Thu, 15 Jan 2015 15:18:05 +0000 (10:18 -0500)
committerTom Rini <trini@ti.com>
Thu, 15 Jan 2015 15:18:05 +0000 (10:18 -0500)

Trivial merge