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

author Tom Rini <trini@konsulko.com>

Thu, 7 Feb 2019 19:48:56 +0000 (14:48 -0500)

committer Tom Rini <trini@konsulko.com>

Thu, 7 Feb 2019 19:48:56 +0000 (14:48 -0500)
author Tom Rini <trini@konsulko.com>
Thu, 7 Feb 2019 19:48:56 +0000 (14:48 -0500)
committer Tom Rini <trini@konsulko.com>
Thu, 7 Feb 2019 19:48:56 +0000 (14:48 -0500)
diff --cc MAINTAINERS
Simple merge
diff --cc configs/clearfog_defconfig
Simple merge
diff --cc configs/db-88f6820-amc_defconfig
Simple merge
diff --cc configs/ds414_defconfig
Simple merge
diff --cc configs/turris_omnia_defconfig
Simple merge
diff --cc include/configs/turris_omnia.h
Simple merge
author	Tom Rini <trini@konsulko.com>
	Thu, 7 Feb 2019 19:48:56 +0000 (14:48 -0500)
committer	Tom Rini <trini@konsulko.com>
	Thu, 7 Feb 2019 19:48:56 +0000 (14:48 -0500)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
configs/clearfog_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/db-88f6820-amc_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/ds414_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/turris_omnia_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/turris_omnia.h	patch \|	diff1 \|	diff2 \|	blob \| history