| commit | a7834aa932e245a13fb2da59471672ca9bf3a7a5 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Tue Jan 27 17:52:51 2015 +0000 |
| committer | Mark Brown <broonie@kernel.org> | Tue Jan 27 17:52:51 2015 +0000 |
| tree | b0176955acf09d94f1e6754b2b9653720cb50b45 | |
| parent | 96da4e5b2e1d04478fb6d540085f2859256ca788 [diff] | |
| parent | 54d96a40e0dfb5aa2eea0b010ddc1c7e8742e364 [diff] |
Merge branch 'topic/rt286' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-w-codec Conflicts: sound/soc/codecs/rt286.c