Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
commit14388a69348d14fb8fb02a2cbd0512af8902e912
authorMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:37:53 +0000 (15 11:37 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:37:53 +0000 (15 11:37 +0100)
treeebce31fb5aebf7373f47725f8a8ae00de8fef0ff
parentc200d8881634a390bcb6ef4e23aa5d9a08d41efa
parentfe581391147cb3d738d961d0f1233d91a9e1113c
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus