Merge branch 'buildman' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Thu, 23 Apr 2015 18:56:47 +0000 (14:56 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 23 Apr 2015 18:56:47 +0000 (14:56 -0400)

Trivial merge