]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@linaro.org>
Mon, 9 Jun 2014 20:20:43 +0000 (21:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 9 Jun 2014 20:20:43 +0000 (21:20 +0100)

Trivial merge