diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-24 16:18:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-24 16:18:20 +0100 |
| commit | c8a075ab1ecdbbe7dc883925cee44c54b535cd8d (patch) | |
| tree | d5bd7c53b8484c3d40b70bcf3c1a7e954de44325 | |
| parent | 5c851ba4d5d23baff8766a2f176d7feaaae3b694 (diff) | |
| parent | ebac95a9208e6b5f134df8518df1bfd1b3fee354 (diff) | |
| parent | 412efa73dcd3bd03c1838c91e094533a95529039 (diff) | |
| parent | 56e7366e43ca676dd28f0e91240a579ad41e9b71 (diff) | |
| parent | 94319ba10ecabc8f28129566d1f5793e3e7a0a79 (diff) | |
Merge remote-tracking branches 'asoc/fix/fsl-ssi', 'asoc/fix/intel', 'asoc/fix/intel-kconfig' and 'asoc/fix/mediatek' into asoc-linus