Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux