summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-04-20 17:21:28 +0100
committerMark Brown <broonie@kernel.org>2016-04-20 17:21:28 +0100
commit74dde20c2d6b360e12c17f20db7735bb5e8115ef (patch)
tree98d5a31830f962c5e16cc705902c551a174ee24d /include
parentb84fff5afb16627a8973256992f3951ac3e90d84 (diff)
parent2f0ad49104cbb19db24442af736614659363d2ab (diff)
parent305e9020f09d28560373c0112682e6fd11e909f6 (diff)
downloadlinux-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