aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-05-29 15:03:27 +0100
committerMark Brown <broonie@kernel.org>2017-05-29 15:03:27 +0100
commitaed323d42578c72488bcc0c1eaa01a802576b227 (patch)
treea58ed39037aa83b26dfca8ca2a83be62fa4d56bb /sound
parent99570f11486e7f8baa886bc481e520191688c8cd (diff)
parente7cc49b8adf25e7bae6acaeb37036ef8726b902c (diff)
parentb08a20f58d2efcd88bf5276e34cd4020028accb7 (diff)
parent51827c41c9ce07293b094691673e6ec23dfdc5e8 (diff)
parent503ada8a6d00c70f5b6fe37249e9a5e2f9c9e202 (diff)
Merge remote-tracking branches 'asoc/topic/stm32', 'asoc/topic/sunxi', 'asoc/topic/tlv320dac31xx' and 'asoc/topic/wm-adsp' into asoc-next