Merge git://git.denx.de/u-boot-spi

diff --cc arch/arm/mach-imx/mx6/ddr.c
Simple merge

diff --cc arch/arm/mach-socfpga/clock_manager.c
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/fsl_qspi.c
Simple merge

diff --cc include/configs/k2g_evm.h
Simple merge

diff --cc scripts/config_whitelist.txt
Simple merge