summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-07-03 16:15:20 +0100
committerMark Brown <broonie@kernel.org>2017-07-03 16:15:20 +0100
commitf116d2ffb9ed4ccce169aacb46a421fb802245c6 (patch)
tree6947a174a3a842d00cb434002020fbfcf4cdfb28 /include/sound
parentcf1f9e5d167a4ce757aa3ad6148c0c65dca03f19 (diff)
parent81321fe9fb69004e71353a602f9d51f656469cdd (diff)
parent8b2840b6daca728cecfa925b50bf638189e2fbca (diff)
parent51827c41c9ce07293b094691673e6ec23dfdc5e8 (diff)
parentb75a65118d287aadeade8b106ed0da7b5e42c167 (diff)
parent503ada8a6d00c70f5b6fe37249e9a5e2f9c9e202 (diff)
Merge remote-tracking branches 'asoc/topic/stm32', 'asoc/topic/sunxi', 'asoc/topic/tlv320dac31xx', 'asoc/topic/topology' and 'asoc/topic/wm-adsp' into asoc-next