| commit | 07df0c7cf84d0dc4ff83d1c6a63d7c4520534221 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Wed Jan 14 11:00:38 2015 -0500 |
| committer | Tom Rini <trini@ti.com> | Wed Jan 14 11:00:38 2015 -0500 |
| tree | c2bc3a310b096b7cbd2394e6d184e1a380fe1f65 | |
| parent | b27e0bc3345226cad1406a289024830fc5e12424 [diff] | |
| parent | e2fb419e5f602bc6b7871b82cd469a0cf7f0884d [diff] |
Merge branch 'buildman' of git://git.denx.de/u-boot-x86 Conflicts: tools/buildman/control.py Signed-off-by: Tom Rini <trini@ti.com>