Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:30 +0000 (19:48 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:30 +0000 (19:48 +0100)
1  2 
sound/soc/soc-pcm.c

Simple merge