tree e3b85d99c34d370673252b22a4800afb0d0bdb07
parent 543c675482bcf1e7b9f85bb1589314f38f60c520
parent 6912831623c5bbd38c6c26039d5f821557e5f541
author Mark Brown <broonie@linaro.org> 1408103488 +0100
committer Mark Brown <broonie@linaro.org> 1408103488 +0100

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