Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)
1  2 
MAINTAINERS
boards.cfg
drivers/mmc/sdhci.c
include/configs/exynos5250-dt.h
include/fdtdec.h
lib/fdtdec.c

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/fdtdec.c
Simple merge