summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 16:32:12 +0100
committerMark Brown <broonie@linaro.org>2014-08-04 16:32:12 +0100
commitc5e64c7636eb53495ee79916ca037fb97700eda0 (patch)
treecff360fdc2bd0b5c6be7a1dbd1dcc3bb19a851ca /sound/soc
parent3510a6949546901cc97fd057e9c74975257375d2 (diff)
parent7523a271682fc1f35355da344249ce8f8c8b8cb9 (diff)
parent08074dc1ae8fe5e9b40b6dc26cbee4b04337750a (diff)
parent96665e312940a0915e74a98cf75938a57d12c723 (diff)
parent423ca88eb5288d3bf381bd5b4601a496ab1ae463 (diff)
Merge remote-tracking branches 'asoc/topic/tlv', 'asoc/topic/tlv320aic23', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/tlv320aic32x4' into asoc-next