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

author Albert ARIBAUD <albert.u.boot@aribaud.net>

Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)

committer Albert ARIBAUD <albert.u.boot@aribaud.net>

Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc drivers/mmc/sdhci.c
Simple merge
diff --cc include/configs/exynos5250-dt.h
Simple merge
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/sdhci.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/exynos5250-dt.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history