| commit | bd5053ffa5b8162257537bdb79ba829372423096 | [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 | ac8192a5877c35735bb95a36e196b2c100c67827 [diff] | |
| parent | 1ddda1b321a102b31bcddc0b1cc23fe3449533c6 [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>