Merge remote-tracking branches 'spi/fix/davinci' and 'spi/fix/sh-msiof' into spi...