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

author Tom Rini <trini@ti.com>

Mon, 24 Nov 2014 17:02:12 +0000 (12:02 -0500)

committer Tom Rini <trini@ti.com>

Mon, 24 Nov 2014 17:02:12 +0000 (12:02 -0500)
author Tom Rini <trini@ti.com>
Mon, 24 Nov 2014 17:02:12 +0000 (12:02 -0500)
committer Tom Rini <trini@ti.com>
Mon, 24 Nov 2014 17:02:12 +0000 (12:02 -0500)
diff --cc arch/arm/lib/crt0.S
Simple merge
diff --cc drivers/block/sata_sil.c
Simple merge
diff --cc drivers/mmc/fsl_esdhc.c
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 24 Nov 2014 17:02:12 +0000 (12:02 -0500)
committer	Tom Rini <trini@ti.com>
	Mon, 24 Nov 2014 17:02:12 +0000 (12:02 -0500)
		1	2
arch/arm/lib/crt0.S	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/sata_sil.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/fsl_esdhc.c	patch \|	diff1 \|	diff2 \|	blob \| history