diff options
author | Mark Brown <broonie@kernel.org> | 2016-04-20 18:21:28 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-04-20 18:21:28 +0200 |
commit | 74dde20c2d6b360e12c17f20db7735bb5e8115ef (patch) | |
tree | 98d5a31830f962c5e16cc705902c551a174ee24d /sound | |
parent | ASoC: topology: Set the link ID when creating a FE DAI link (diff) | |
parent | ASoC: Change DAI link's be_id to a generic id (diff) | |
parent | ASoC: Export snd_soc_find_dai() (diff) | |
download | linux-74dde20c2d6b360e12c17f20db7735bb5e8115ef.tar.xz linux-74dde20c2d6b360e12c17f20db7735bb5e8115ef.zip |
Merge branches 'topic/dai-link' and 'topic/find-dai' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-topology