Merge branch 'spi-linus' into spi-next