Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus