aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-13 14:26:46 +0100
committerMark Brown <broonie@kernel.org>2016-05-13 14:26:46 +0100
commite449f7a394dfa444d2e3c15be2cffb758c79a6c9 (patch)
treed500861e74ebc8c8574d456ffc9e39a324d3d2e6 /sound
parent1c21e63465d1cbe051256951236a694c0a32e39d (diff)
parentddecd1492de476488a92493510fb86c6ffe9acbd (diff)
parent3fafd14d9422c46f5c2a142298384dc15dbf88b2 (diff)
downloadlinux-stericsson-e449f7a394dfa444d2e3c15be2cffb758c79a6c9.tar.gz
Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dwc' into asoc-next