Merge branches 'spi-drivers' and 'spi-mxs' into spi-next