]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 7 Jan 2014 17:58:09 +0000 (17:58 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 7 Jan 2014 17:58:09 +0000 (17:58 +0000)

Trivial merge