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)
commitbad6f621e492f65a0bf0fbe8db1c9c7f20da6a60
tree93e1649e45919a7b39675a9feefd321685d8c903
parentcee429e5c53f7ffc1dd500001d9dff567833c23d
parent4c715c758c72ec5885ccfadf4e98ca76262ba619
parente6c111fac4464e3f4bf7b3802b517dafc80f8e0f
Merge remote-tracking branches 'asoc/fix/pxa' and 'asoc/fix/tlv320aic3x' into asoc-linus
sound/soc/codecs/tlv320aic3x.c
sound/soc/pxa/pxa-ssp.c