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

author Tom Rini <trini@ti.com>

Fri, 21 Feb 2014 13:00:22 +0000 (08:00 -0500)

committer Tom Rini <trini@ti.com>

Fri, 21 Feb 2014 13:00:22 +0000 (08:00 -0500)
author Tom Rini <trini@ti.com>
Fri, 21 Feb 2014 13:00:22 +0000 (08:00 -0500)
committer Tom Rini <trini@ti.com>
Fri, 21 Feb 2014 13:00:22 +0000 (08:00 -0500)
diff --cc arch/arm/include/asm/arch-mx6/imx-regs.h
Simple merge
diff --cc include/configs/am43xx_evm.h
Simple merge
author	Tom Rini <trini@ti.com>
	Fri, 21 Feb 2014 13:00:22 +0000 (08:00 -0500)
committer	Tom Rini <trini@ti.com>
	Fri, 21 Feb 2014 13:00:22 +0000 (08:00 -0500)
		1	2
arch/arm/include/asm/arch-mx6/imx-regs.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/am43xx_evm.h	patch \|	diff1 \|	diff2 \|	blob \| history