summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-29 12:44:31 -0700
committerMark Brown <broonie@kernel.org>2016-09-29 12:44:31 -0700
commit971dec826c211c8fef4ed5b6db2cb048873a020b (patch)
treeb2545e76de35e9a92fb843eed22fae8b28f7a624 /include/sound
parent3b495e4bf34b5e4ad2658e08694493e6068e2e5d (diff)
parentec103964776bf8af74e66eb1a810eada757718a5 (diff)
parent519302954b726612eea6362047660cd56aa15c2e (diff)
parent9be072a6f9187f087a8b7682b70b898ac5cb7d64 (diff)
parent1e814030954015e42621191f3adc52df2241dc08 (diff)
Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool', 'asoc/topic/omap' and 'asoc/topic/platform-drvdata' into asoc-next