Merge branch 'spi' of git://gitorious.org/linus-tree/linus-tree into spi/next