aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/soc-generic-dmaengine-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-11 11:12:20 +0000
committerMark Brown <broonie@linaro.org>2013-12-11 11:12:20 +0000
commitd3ae8835301043ed84c8e78ecb06d5f0b0548f4a (patch)
tree95c09e39240f7feb9d1e88debc2ef8facd1ce3f4 /sound/soc/soc-generic-dmaengine-pcm.c
parent194c7dea00c68c1b1f8ff26304fa937a006f66dd (diff)
parent0ad7c00057dc1640647c1dc81ccbd009de17a767 (diff)
Merge branch 'topic/defer_probe' of git://git.infradead.org/users/vkoul/slave-dma into asoc-dma
The following branch/patch is a dependency for my "ASoC: dmaengine: support deferred probe for DMA channels". If you could pull the branch below into your topic/dma, then merge my ASoC patch, that would be great. I would then like to merge your topic/dma into the Tegra tree as a baseline for the Tegra conversion to the standard DMA DT bindings. Vinod has confirmed this his topic/defer_probe branch is stable, and won't be rebased: https://lkml.org/lkml/2013/12/10/463
Diffstat (limited to 'sound/soc/soc-generic-dmaengine-pcm.c')
0 files changed, 0 insertions, 0 deletions