Merge branch 'fix/fsl-dspi' of...

Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi

Conflicts:
	drivers/spi/spi-fsl-dspi.c