]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac8192a 1ddda1b)
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)
Conflicts:
tools/buildman/control.py

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

Trivial merge
Cloned from git://git.denx.de/u-boot.git