Merge branch 'master' of git://git.denx.de/u-boot

author Stefano Babic <sbabic@denx.de>

Mon, 2 Mar 2015 08:42:53 +0000 (09:42 +0100)

committer Stefano Babic <sbabic@denx.de>

Mon, 2 Mar 2015 08:42:53 +0000 (09:42 +0100)
author Stefano Babic <sbabic@denx.de>
Mon, 2 Mar 2015 08:42:53 +0000 (09:42 +0100)
committer Stefano Babic <sbabic@denx.de>
Mon, 2 Mar 2015 08:42:53 +0000 (09:42 +0100)
diff --cc README
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/mmc/fsl_esdhc.c
Simple merge
diff --cc include/fsl_esdhc.h
Simple merge
diff --cc include/mmc.h
Simple merge
author	Stefano Babic <sbabic@denx.de>
	Mon, 2 Mar 2015 08:42:53 +0000 (09:42 +0100)
committer	Stefano Babic <sbabic@denx.de>
	Mon, 2 Mar 2015 08:42:53 +0000 (09:42 +0100)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/fsl_esdhc.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/fsl_esdhc.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/mmc.h	patch \|	diff1 \|	diff2 \|	blob \| history