tree c45b18a2f640ebd945a61c601ab3a83d6c1c34b7
parent 4bd93343124ffe3bdc21c2b485c2668aba6651be
parent fe581391147cb3d738d961d0f1233d91a9e1113c
author Mark Brown <broonie@linaro.org> 1376385592 +0100
committer Mark Brown <broonie@linaro.org> 1376385592 +0100

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