tree 0df8513839cdbd5f6993df6602db62b0e5a718e0
parent 0d054318d5349a60922b30f2cf572b8b613712f7
parent 56a678344273fd63f8ade26876283a2586a9bf3a
author Mark Brown <broonie@linaro.org> 1375301243 +0100
committer Mark Brown <broonie@linaro.org> 1375301243 +0100

Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus