summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-02-07 12:25:47 +0100
committerMark Brown <broonie@kernel.org>2018-02-07 12:25:47 +0100
commit3d0a352a552e6cdf052e8baf66f1fe6418c122fe (patch)
tree83a04e103585e26e35e25cfd3fb2ba1aed978979 /sound
parentMerge remote-tracking branches 'asoc/topic/max98373', 'asoc/topic/mtk', 'asoc... (diff)
parentASoC: sam9x5_wm8731: Drop 'ASoC' prefix from error messages (diff)
parentASoC: sgtl5000: Clarify a bit about the ER1 meaning (diff)
parentASoC: sun8i-codec: Add ADC support for a33 (diff)
downloadlinux-3d0a352a552e6cdf052e8baf66f1fe6418c122fe.tar.xz
linux-3d0a352a552e6cdf052e8baf66f1fe6418c122fe.zip
Merge remote-tracking branches 'asoc/topic/sam9x5_wm8731', 'asoc/topic/sgtl5000' and 'asoc/topic/sun8i-codec' into asoc-next