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

author Tom Rini <trini@konsulko.com>

Wed, 28 Oct 2015 20:56:43 +0000 (16:56 -0400)

committer Tom Rini <trini@konsulko.com>

Wed, 28 Oct 2015 20:56:43 +0000 (16:56 -0400)
author Tom Rini <trini@konsulko.com>
Wed, 28 Oct 2015 20:56:43 +0000 (16:56 -0400)
committer Tom Rini <trini@konsulko.com>
Wed, 28 Oct 2015 20:56:43 +0000 (16:56 -0400)
diff --cc drivers/mtd/spi/sf_probe.c
Simple merge
diff --cc drivers/spi/fsl_qspi.c
Simple merge
diff --cc drivers/spi/ich.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Wed, 28 Oct 2015 20:56:43 +0000 (16:56 -0400)
committer	Tom Rini <trini@konsulko.com>
	Wed, 28 Oct 2015 20:56:43 +0000 (16:56 -0400)
		1	2
drivers/mtd/spi/sf_probe.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/fsl_qspi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/ich.c	patch \|	diff1 \|	diff2 \|	blob \| history