Merge branches 'spi-core' and 'spi-tegra' into spi-next