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

author Tom Rini <trini@konsulko.com>

Mon, 17 Jun 2019 15:32:22 +0000 (11:32 -0400)

committer Tom Rini <trini@konsulko.com>

Mon, 17 Jun 2019 15:32:22 +0000 (11:32 -0400)
author Tom Rini <trini@konsulko.com>
Mon, 17 Jun 2019 15:32:22 +0000 (11:32 -0400)
committer Tom Rini <trini@konsulko.com>
Mon, 17 Jun 2019 15:32:22 +0000 (11:32 -0400)
diff --cc Kconfig
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc env/Kconfig
Simple merge
author	Tom Rini <trini@konsulko.com>
	Mon, 17 Jun 2019 15:32:22 +0000 (11:32 -0400)
committer	Tom Rini <trini@konsulko.com>
	Mon, 17 Jun 2019 15:32:22 +0000 (11:32 -0400)
		1	2
Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
env/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history