diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-22 10:24:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-22 10:24:30 +0100 |
| commit | dacdd369113cb7ba91b8e70b09456ca6cdcc2184 (patch) | |
| tree | a501e73bff94cae26cb2a29bdaa3f1f6877a830c | |
| parent | 1cdf4f6113d2fbe98bb528f6b51a682f24d3aac1 (diff) | |
| parent | e85dae7048dc53b6945219b02c56041e4a661e6c (diff) | |
| parent | 8610d09a40c10dea55dada151cf85cce253f511c (diff) | |
Merge remote-tracking branches 'asoc/topic/intel' and 'asoc/topic/max98090' into asoc-next