Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 22 Apr 2014 21:01:04 +0000 (22:01 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 22 Apr 2014 21:01:04 +0000 (22:01 +0100)
commit31835046beba8890e34ea79ca7e5aa7811cbfa4a
treebf4b1cf7511f771f212d71f01c1f2c345d658811
parenta798c10faf62a505d24e5f6213fbaf904a39623f
parent2697e4fb9209dfe1d1b24c92d254158f63d4bc8e
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus