Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant