Merge branch 'buildman' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Wed, 14 Jan 2015 16:00:38 +0000 (11:00 -0500)
committerTom Rini <trini@ti.com>
Wed, 14 Jan 2015 16:00:38 +0000 (11:00 -0500)
commitbd5053ffa5b8162257537bdb79ba829372423096
treec2bc3a310b096b7cbd2394e6d184e1a380fe1f65
parentac8192a5877c35735bb95a36e196b2c100c67827
parent1ddda1b321a102b31bcddc0b1cc23fe3449533c6
Merge branch 'buildman' of git://git.denx.de/u-boot-x86

Conflicts:
tools/buildman/control.py

Signed-off-by: Tom Rini <trini@ti.com>