]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branches 'asoc/fix/audmux' and 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@linaro.org>
Fri, 25 Apr 2014 11:12:09 +0000 (12:12 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 25 Apr 2014 11:12:09 +0000 (12:12 +0100)

Trivial merge