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