Merge remote-tracking branches 'spi/fix/dw' and 'spi/fix/sirf' into spi-linus