summaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-10 21:31:23 +0000
committerMark Brown <broonie@kernel.org>2017-11-10 21:31:23 +0000
commit0d7b5c93e52a539d900d966bdf7d79f9b7002e0a (patch)
tree520ad6fbf0edce042acb4d1786657a0f83124dd4 /sound/core
parent5b04644a48a5ba1c9c1b6561819c90f293d5b933 (diff)
parent57f7feff2912d6996b5f3fcac084308ce195127c (diff)
parentc56308775b5b81683789f9ee03f009493b51e6ab (diff)
Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5514' into asoc-next