diff options
author | Mark Brown <broonie@linaro.org> | 2014-07-29 20:39:58 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-07-29 20:39:58 +0100 |
commit | 13a8468db42682b5f1370fcf7c28ecebd76199bf (patch) | |
tree | 4c3cded5884906c6b157f9c2ab9546450e3e7a65 /sound | |
parent | 3a813c0e282fd1636861af6b4d443ebcaeae7c27 (diff) | |
parent | 96665e312940a0915e74a98cf75938a57d12c723 (diff) | |
parent | 423ca88eb5288d3bf381bd5b4601a496ab1ae463 (diff) | |
parent | 2a11a10abe1b88b86e44480511262c72da97e55a (diff) | |
parent | 5bca396919aed5fbed61197019824bd3ff9f127d (diff) | |
parent | 8bfcab7c6b44038993fb1a7771ae0ce5d1bf6ea3 (diff) |
Merge remote-tracking branches 'asoc/topic/tlv320aic31xx', 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x', 'asoc/topic/wm0010' and 'asoc/topic/wm8904' into asoc-next