Merge branch 'buildman' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Wed, 10 Sep 2014 00:02:43 +0000 (20:02 -0400)
committerTom Rini <trini@ti.com>
Wed, 10 Sep 2014 00:02:43 +0000 (20:02 -0400)

Trivial merge