Mark Brown 63031ed6b8 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

2015-04-07 11:54:40 +01:00

16 KiB

Raw Blame History

View Raw