summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-07-03 16:15:19 +0100
committerMark Brown <broonie@kernel.org>2017-07-03 16:15:19 +0100
commitcf1f9e5d167a4ce757aa3ad6148c0c65dca03f19 (patch)
tree3b89b8b14819dc6e41b462d4178852e96bbc46d6 /sound/soc/codecs
parent2716765697a11a6a42c3c7536ff7b12a0facfecd (diff)
parent0994c030443b50089b8ac74bc863d71238739f2e (diff)
parenta729526720059ae019803acc953f07d9c17ae234 (diff)
parent3048e76c93bccf875a49025870de08aed86c4692 (diff)
Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000' and 'asoc/topic/sh' into asoc-next