Merge branch 'buildman' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Thu, 5 Mar 2015 23:30:38 +0000 (18:30 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 6 Mar 2015 01:50:31 +0000 (20:50 -0500)

Trivial merge