]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 15 May 2014 14:36:02 +0000 (16:36 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 15 May 2014 14:36:02 +0000 (16:36 +0200)
1  2 
board/samsung/trats/trats.c
board/samsung/trats2/trats2.c
board/samsung/universal_c210/universal.c
boards.cfg
include/configs/trats.h
include/configs/trats2.h

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