Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

diff --cc board/samsung/trats/trats.c
Simple merge

diff --cc board/samsung/trats2/trats2.c
Simple merge

diff --cc board/samsung/universal_c210/universal.c
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc include/configs/trats.h
Simple merge

diff --cc include/configs/trats2.h
Simple merge