]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branches 'asoc/fix/rcar' and 'asoc/fix/tlv320aic31xx' into...
authorMark Brown <broonie@linaro.org>
Tue, 6 May 2014 01:25:36 +0000 (18:25 -0700)
committerMark Brown <broonie@linaro.org>
Tue, 6 May 2014 01:25:36 +0000 (18:25 -0700)

Trivial merge