Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 14 May 2014 11:52:32 +0000 (12:52 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 14 May 2014 11:52:32 +0000 (12:52 +0100)
commit0d1203f29199a1d754bd1ca335c3dc6b14be160b
tree9c9140dade5a0b9bd60404f06dcce5120365586c
parent34e0a1e1563809a07371f44c6e4c3e216dc8684d
parentce85a4d726ecd286f933d4eedf01c5acb4f47a38
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus