Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/doc', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:56 +0000 (13:11 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:56 +0000 (13:11 +0000)
commitfed25395ff76cf44302ed8f741cc1a86a554aef5
tree52f2a931fd69fab5171b52c1a4cb0c90e7a01c81
parentb39af5b38d04008d289b9993f327eb54a0470200
parentc117b4a39ba3940db937c6e46aed3bc49b6f9c4c
parentbb29a93b38610d2adc6ead40b75e1a1991617550
parent075207d24a394bcdb3a864446f391d4014a04cd4
parentb163be4cf4a3bb673038a21e368954f7f88347b7
parente98c89e05e8b33ad40efff2012c1404e39d12ad8
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/doc', 'asoc/topic/dpcm', 'asoc/topic/dwc' and 'asoc/topic/fsi' into asoc-next
sound/soc/sh/fsi.c
sound/soc/soc-pcm.c