Merge remote-tracking branch 'spi/topic/sirf' into spi-next