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)
commitb9fb729949bcd9e592a4c599d2d7875157181db9
treeea7755a55656ca3febad3ced03229e3f2e81669d
parent7b8ab38e8d9cc804f0d3c263bfaa62d82d8a2da7
parent5e63dfccf34d4dbf21429c4919f33c028ff49991
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
sound/soc/soc-core.c
sound/soc/soc-pcm.c