diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-13 19:07:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-13 19:07:05 +0100 |
| commit | 99a22dc7ae1b50a032a1b43ce330e139a99165a4 (patch) | |
| tree | 1b8240cf70a161f1b66d64218c8158101dff7f7b /sound | |
| parent | 0cb9e9fc94454a3ccbd1812947f7cc3ecf4d480b (diff) | |
| parent | b8909783a22b4f169ade830e0aa6dafe313426f1 (diff) | |
| parent | 4f8210f66e5a200c63770ea9445ff913a28a3be2 (diff) | |
Merge remote-tracking branches 'asoc/fix/audmux' and 'asoc/fix/fsl-esai' into asoc-linus