Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6