Merge remote-tracking branches 'asoc/fix/pxa' and 'asoc/fix/tlv320aic3x' into asoc...
authorMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:38 +0000 (10:39 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:38 +0000 (10:39 +0100)
1  2  3 
sound/soc/codecs/tlv320aic3x.c
sound/soc/pxa/pxa-ssp.c

Simple merge
Simple merge