]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d76e2a edd8890)
Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Wed, 31 Dec 2014 20:10:36 +0000 (15:10 -0500)
committerTom 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
"Das U-Boot" Source Tree