Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 19 Jun 2013 18:49:22 +0000 (19:49 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 19 Jun 2013 18:49:22 +0000 (19:49 +0100)
commitf9511d84e64c0b71a588e5a3985d27566701d9e8
tree7fafe2acb53db38b5a80eb44047d525dd6282911
parent4bb762056f4dff29fe66d0735b709475b5a28b9f
parentefc77e36ae6ff4394a0232a4f87bded0bd555d6b
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
sound/soc/soc-dapm.c