diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-24 16:18:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-24 16:18:22 +0100 |
| commit | 996034b117b467709dec7811ef134063934fa626 (patch) | |
| tree | a1a55e035a07a552b3bfef8082c66ee3a4e9dbc1 /include | |
| parent | c8a075ab1ecdbbe7dc883925cee44c54b535cd8d (diff) | |
| parent | b101acfabc9377469af3abfb7cb63112da367284 (diff) | |
| parent | 2c57d478018551f2a0983293413f2f198e49ec23 (diff) | |
| parent | 2dfbe9afcda3243dd309826cbbb8ae9e9f602006 (diff) | |
Merge remote-tracking branches 'asoc/fix/sgtl5000', 'asoc/fix/topology' and 'asoc/fix/zx' into asoc-linus