Merge remote-tracking branch 'spi/fix/pxa' into spi-linus