summaryrefslogtreecommitdiff
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 13:11:56 +0000
committerMark Brown <broonie@kernel.org>2014-12-08 13:11:56 +0000
commitfed25395ff76cf44302ed8f741cc1a86a554aef5 (patch)
tree52f2a931fd69fab5171b52c1a4cb0c90e7a01c81 /sound/soc/soc-pcm.c
parentb39af5b38d04008d289b9993f327eb54a0470200 (diff)
parentc117b4a39ba3940db937c6e46aed3bc49b6f9c4c (diff)
parentbb29a93b38610d2adc6ead40b75e1a1991617550 (diff)
parent075207d24a394bcdb3a864446f391d4014a04cd4 (diff)
parentb163be4cf4a3bb673038a21e368954f7f88347b7 (diff)
parente98c89e05e8b33ad40efff2012c1404e39d12ad8 (diff)
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/doc', 'asoc/topic/dpcm', 'asoc/topic/dwc' and 'asoc/topic/fsi' into asoc-next