projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d76e2a
edd8890
)
Merge branch 'master' of git://git.denx.de/u-boot-usb
author
Tom Rini
<trini@ti.com>
Wed, 31 Dec 2014 20:10:36 +0000
(15:10 -0500)
committer
Tom Rini
<trini@ti.com>
Wed, 31 Dec 2014 20:10:36 +0000
(15:10 -0500)
Conflicts:
include/configs/arndale.h
Signed-off-by: Tom Rini <trini@ti.com>
Trivial merge
projects / oweals / u-boot.git / commitdiff