Merge remote-tracking branch 'spi/topic/tegra' into spi-next

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

diff --cc drivers/spi/spi-tegra20-sflash.c
Simple merge

diff --cc drivers/spi/spi-tegra20-slink.c
Simple merge