]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 11 May 2013 20:24:28 +0000 (22:24 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 11 May 2013 20:24:28 +0000 (22:24 +0200)
1  2 
MAINTAINERS
README
boards.cfg
common/spl/spl.c
include/configs/omap5_uevm.h

diff --cc MAINTAINERS
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
Simple merge
Simple merge