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

author Mark Brown <[email protected]>

Sun, 30 Mar 2014 00:50:56 +0000 (00:50 +0000)

committer Mark Brown <[email protected]>

Sun, 30 Mar 2014 00:50:56 +0000 (00:50 +0000)
author Mark Brown <[email protected]>
Sun, 30 Mar 2014 00:50:56 +0000 (00:50 +0000)
committer Mark Brown <[email protected]>
Sun, 30 Mar 2014 00:50:56 +0000 (00:50 +0000)
diff --cc drivers/spi/spi.c
Simple merge
diff --cc include/linux/spi/spi.h
Simple merge
author	Mark Brown <[email protected]>
	Sun, 30 Mar 2014 00:50:56 +0000 (00:50 +0000)
committer	Mark Brown <[email protected]>
	Sun, 30 Mar 2014 00:50:56 +0000 (00:50 +0000)
		1	2
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/spi/spi.h	patch \|	diff1 \|	diff2 \|	blob \| history