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

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

Mon, 2 Jun 2014 06:43:48 +0000 (08:43 +0200)

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

Mon, 2 Jun 2014 06:43:48 +0000 (08:43 +0200)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 2 Jun 2014 06:43:48 +0000 (08:43 +0200)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 2 Jun 2014 06:43:48 +0000 (08:43 +0200)
diff --cc drivers/mmc/mmc.c
Simple merge
diff --cc drivers/power/pmic/Makefile
Simple merge
diff --cc include/configs/mx53evk.h
Simple merge
diff --cc include/configs/mx53loco.h
Simple merge
diff --cc include/mmc.h
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Mon, 2 Jun 2014 06:43:48 +0000 (08:43 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Mon, 2 Jun 2014 06:43:48 +0000 (08:43 +0200)
		1	2
drivers/mmc/mmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/pmic/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/mx53evk.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/mx53loco.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/mmc.h	patch \|	diff1 \|	diff2 \|	blob \| history