Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:39 +0000 (13:11 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:39 +0000 (13:11 +0000)
1  2 
sound/soc/soc-pcm.c

Simple merge