diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-16 14:02:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-16 14:02:52 +0000 |
| commit | c6affc0dba45bb2074ff56b21386d22eeaf682f8 (patch) | |
| tree | f978ad08f524b671d12b1116dc8bbdc57dd743d8 | |
| parent | 7e22e91102c6b9df7c4ae2168910e19d2bb14cd6 (diff) | |
| parent | e20970ada3f699c113fe64b04492af083d11a7d8 (diff) | |
| parent | e8e08c521dc101cf7e7e1caf4f487f9fe11a9a7a (diff) | |
Merge remote-tracking branches 'asoc/fix/adau1701' and 'asoc/fix/tlv320aic32x4' into asoc-linus