From: Tom Rini <trini@ti.com>
Date: Wed, 14 Jan 2015 16:00:38 +0000 (-0500)
Subject: Merge branch 'buildman' of git://git.denx.de/u-boot-x86
X-Git-Tag: KARO-TXA5-2015-06-26~38^2~110
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=bd5053ffa5b8162257537bdb79ba829372423096

Merge branch 'buildman' of git://git.denx.de/u-boot-x86

Conflicts:
	tools/buildman/control.py

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

bd5053ffa5b8162257537bdb79ba829372423096