Merge remote-tracking branch 'asoc/fix/dapm' into asoc-dapm
authorMark Brown <broonie@linaro.org>
Tue, 13 Aug 2013 09:19:52 +0000 (10:19 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 13 Aug 2013 09:19:52 +0000 (10:19 +0100)
commitf2e537425a6eae2d70ece5f62c26611f316b70f9
treec45b18a2f640ebd945a61c601ab3a83d6c1c34b7
parent4bd93343124ffe3bdc21c2b485c2668aba6651be
parentfe581391147cb3d738d961d0f1233d91a9e1113c
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-dapm
sound/soc/soc-dapm.c