Merge branch 'buildman' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Wed, 2 Oct 2013 12:26:23 +0000 (08:26 -0400)
committerTom Rini <trini@ti.com>
Wed, 2 Oct 2013 12:26:23 +0000 (08:26 -0400)

Trivial merge