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)
commit14eec47753216e185396be5b0e6f04f274bfe4a5
treea705958bc9a154684440ac1482d642b6d2cf4bd4
parente6c6fd896bbe4fe8967c5ba6f2d5db056a1da688
parentc6644119a3f80ea644bde10009d5e1013b5aff29
Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next
sound/soc/samsung/i2s.c
sound/soc/samsung/s3c2412-i2s.c
sound/soc/samsung/s3c24xx-i2s.c