Merge remote-tracking branches 'spi/fix/imx' and 'spi/fix/sh-msiof' into spi-linus