Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:46 +0000 (15:52 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:52:46 +0000 (15:52 +0000)
1  2 
sound/soc/samsung/i2s.c
sound/soc/samsung/s3c2412-i2s.c
sound/soc/samsung/s3c24xx-i2s.c

Simple merge
Simple merge
Simple merge