summaryrefslogtreecommitdiff
path: root/include/sound/aci.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-19 16:36:23 +0000
committerMark Brown <broonie@kernel.org>2017-02-19 16:36:23 +0000
commit96f0e8a5b0979255e64ee8431f8287a41dc79140 (patch)
tree7e068b93f4e78627969144ee95251fad04012632 /include/sound/aci.h
parent59acd5dfcc1e786273beba2edb8645eb3ef01285 (diff)
parente21ab17904ff5c56bd6d6d062824ca584a42d89f (diff)
parent245c5c7b0863eda23e8cb1907e74579a42185888 (diff)
parentd61b23daf0c6b5e0615b3b900c333d7dbd07816f (diff)
parent4957b556f5e7ef9855d698b7ae2f0d4245c7ff50 (diff)
parentb07609cecaac6681a2fca3eebc1bae7b00282620 (diff)
Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328', 'asoc/topic/fsl', 'asoc/topic/fsl-sai' and 'asoc/topic/graph' into asoc-next