diff options
author | Mark Brown <broonie@kernel.org> | 2018-01-25 18:16:26 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-01-25 18:16:26 +0000 |
commit | 0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f (patch) | |
tree | b6597ffe774a67ab5b8eebd57c9a723732d3a39c /sound | |
parent | 3bb0f7c31b1aedd0f85c675297031281799145d7 (diff) | |
parent | 93a00c467fe998bf5716cbc9cabc127046054782 (diff) |
Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-twl-breakage
Diffstat (limited to 'sound')