Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 8 Oct 2014 15:44:49 +0000 (16:44 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 8 Oct 2014 15:44:49 +0000 (16:44 +0100)
1  2 
sound/soc/soc-core.c
sound/soc/soc-pcm.c

Simple merge
Simple merge