diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:23 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:23 +0800 |
| commit | 5a7fa6b0d28349d4aa35c6287b9fa186d7224221 (patch) | |
| tree | 1260486edd32273b669c52c35c71817debff1e17 /sound | |
| parent | 6e685ea6aaa3c578596ff8dbe6efde9485fc68f9 (diff) | |
| parent | 5396ecf7b1920595deec83b902502bd3d2da184e (diff) | |
| parent | 3a96878e6d01b70836cbf8a0e968619ef2e2aceb (diff) | |
Merge remote-tracking branches 'asoc/topic/mxs-saif' and 'asoc/topic/nuc900' into asoc-next