| commit | beb8962210f592bd285ed77559ac4458cc26f774 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Fri Jul 24 16:11:47 2015 +0100 |
| committer | Mark Brown <broonie@kernel.org> | Fri Jul 24 16:11:47 2015 +0100 |
| tree | f36bba55c0582758f89ac05dccff197b1bbd4d32 | |
| parent | eeffd4b442eb2aa25257d8c6631b17cba685ccac [diff] | |
| parent | 1c07a4de5baad76585f7ffb86b5b0bc34c33e8a6 [diff] |
Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ssm4567 Conflicts: sound/soc/codecs/ssm4567.c