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

author Tom Rini <trini@ti.com>

Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)

committer Tom Rini <trini@ti.com>

Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)
author Tom Rini <trini@ti.com>
Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)
committer Tom Rini <trini@ti.com>
Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)
diff --cc README
Simple merge
diff --cc drivers/mtd/spi/spi_flash.c
Simple merge
diff --cc drivers/mtd/spi/spi_flash_internal.h
Simple merge
author	Tom Rini <trini@ti.com>
	Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)
committer	Tom Rini <trini@ti.com>
	Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/spi/spi_flash.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/spi/spi_flash_internal.h	patch \|	diff1 \|	diff2 \|	blob \| history