Merge remote-tracking branch 'spi/topic/mxs' into spi-next