tree cc3d5a45d49e6a3403e3d284903debe7f783541e
parent ca89bc248e2fac44d6374a48b8d38b068c7a1bdf
parent 298402a3858e17e6a78acafa1dcd490167dd9f74
author Mark Brown <broonie@linaro.org> 1383545052 -0800
committer Mark Brown <broonie@linaro.org> 1383545052 -0800

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