| commit | 8a5b69017e1923ce467c6e0c6231e0882f4afe56 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Thu Feb 05 20:18:39 2015 +0000 |
| committer | Mark Brown <broonie@kernel.org> | Thu Feb 05 20:18:39 2015 +0000 |
| tree | cbb60d38560b6880ecea9bfc3460ecd80220d8fb | |
| parent | e948262ad01fc683d893abe10d1161231b2a6457 [diff] | |
| parent | 5c2b06369dafd796ebb4f17dab543d3da500245e [diff] |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel Conflicts: sound/soc/intel/sst/sst_acpi.c