tree 458bacf0efa74371aa1bda289ed5a96f31743962
parent 1c4b578aa4ea2ef98871dc8ad95acb1fa14f9bcd
parent faf6615bf05bc5cecc6e22013b9cb21c77784fd1
author Mark Brown <broonie@linaro.org> 1386094139 +0000
committer Mark Brown <broonie@linaro.org> 1386094139 +0000

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