Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:30 +0000 (13:54 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:30 +0000 (13:54 +0000)
1  2 
sound/soc/soc-pcm.c

Simple merge