Merge remote-tracking branches 'spi/fix/dspi' and 'spi/fix/spidev' into spi-linus