Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next

author Mark Brown <broonie@kernel.org>

Mon, 12 Dec 2016 15:52:46 +0000 (15:52 +0000)

committer Mark Brown <broonie@kernel.org>

Mon, 12 Dec 2016 15:52:46 +0000 (15:52 +0000)
author Mark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:46 +0000 (15:52 +0000)
committer Mark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:46 +0000 (15:52 +0000)
diff --cc sound/soc/samsung/i2s.c
Simple merge
diff --cc sound/soc/samsung/s3c2412-i2s.c
Simple merge
diff --cc sound/soc/samsung/s3c24xx-i2s.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 12 Dec 2016 15:52:46 +0000 (15:52 +0000)
committer	Mark Brown <broonie@kernel.org>
	Mon, 12 Dec 2016 15:52:46 +0000 (15:52 +0000)
		1	2
sound/soc/samsung/i2s.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/samsung/s3c2412-i2s.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/samsung/s3c24xx-i2s.c	patch \|	diff1 \|	diff2 \|	blob \| history