projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ac8192a
1ddda1b
)
Merge branch 'buildman' of git://git.denx.de/u-boot-x86
author
Tom Rini
<trini@ti.com>
Wed, 14 Jan 2015 16:00:38 +0000
(11:00 -0500)
committer
Tom 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