Merge branch 'for-spi' into s5p-fixes-for-linus