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

- SPI-NOR support

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