]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Thu, 22 May 2014 16:56:15 +0000 (12:56 -0400)
committerTom Rini <trini@ti.com>
Thu, 22 May 2014 16:56:15 +0000 (12:56 -0400)
1  2 
README
common/cmd_bootm.c
common/image.c
include/configs/omap3_beagle.h
include/image.h

diff --cc README
Simple merge
Simple merge
diff --cc common/image.c
Simple merge
Simple merge
diff --cc include/image.h
Simple merge