summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 12:12:29 +0100
committerMark Brown <broonie@kernel.org>2017-09-01 12:12:29 +0100
commit8f90409f91e338fc8b026bffafe7a3877d1a5ac7 (patch)
treef92b9d8b2520fe035c788a690568dfe4b22945c1 /sound
parenta641ed5e35dfa1276aa59ba1426d3e6adb0c2823 (diff)
parentc5660778b4851b1aea5d848ccfde3f27949f6418 (diff)
parentdb3be255a101da11f67c0f3053b750e767eb10fe (diff)
parent72a63c6e78887f5c2063ce147b57fdfecf366e0e (diff)
downloadlinux-8f90409f91e338fc8b026bffafe7a3877d1a5ac7.tar.bz2
Merge remote-tracking branches 'asoc/topic/cs35l33', 'asoc/topic/cs35l34' and 'asoc/topic/cs42l42' into asoc-next