Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus
authorMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:23:55 +0000 (11:23 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:23:55 +0000 (11:23 +0100)
commitdfbbe16f144fc68580062a05a9cbd1df9b4bc82e
tree4ef5c8e0727781bfecd41bd903a7fa66c86296be
parent92359d6d65e34c99935514d706fe1ddd0b2f137c
parent64256ac6c2b6fb598fbe187a5503fd9dbb810374
Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus