diff options
author | Mark Brown <broonie@kernel.org> | 2016-04-20 17:21:28 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-04-20 17:21:28 +0100 |
commit | 74dde20c2d6b360e12c17f20db7735bb5e8115ef (patch) | |
tree | 98d5a31830f962c5e16cc705902c551a174ee24d /include | |
parent | b84fff5afb16627a8973256992f3951ac3e90d84 (diff) | |
parent | 2f0ad49104cbb19db24442af736614659363d2ab (diff) | |
parent | 305e9020f09d28560373c0112682e6fd11e909f6 (diff) | |
download | linux-74dde20c2d6b360e12c17f20db7735bb5e8115ef.tar.gz linux-74dde20c2d6b360e12c17f20db7735bb5e8115ef.tar.bz2 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