Merge remote-tracking branch 'spi/fix/omap2-mcspi' into spi-omap2-mcspi