summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-03-28 10:29:07 +0800
committerMark Brown <broonie@kernel.org>2018-03-28 10:29:07 +0800
commit2236a28f288b715e7bf99ab6f6fc0dca4c735333 (patch)
treeca8bf6ca96cea4323888497e827832337d0e0f28 /sound
parent53ccd1aa83f59e966e0d332a161eaa6f581139af (diff)
parentb305d8c21cf9c009ce4995084cb44151c7306fc9 (diff)
parent4f404f38c92b13815722dd6e808dde24cd65eed5 (diff)
parentfa643703a8776cb8987843ea81c765fdf2419383 (diff)
downloadlinux-2236a28f288b715e7bf99ab6f6fc0dca4c735333.tar.bz2
Merge remote-tracking branches 'asoc/topic/cpcap', 'asoc/topic/cq93vc' and 'asoc/topic/cs35l32' into asoc-next