summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:57:13 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:57:13 +0100
commit0a5ff077572d058d3023d243ba97a7e98d111f4c (patch)
tree347503567262cda92c6557f63b9aac0b490a0474 /sound
parentcfed47d7b5abd5ce9c010169cce9c2754394a02d (diff)
parent601e4576594543200bde9201e4d23242e73a778b (diff)
parent97a747117d95b54fe3ce21d43e04499a1671fff6 (diff)
parente12909107c30efccf570ac67802df5d2eec4cabd (diff)
parent601b9d9c7bd04f81a96896c9859cd37bd6a78d51 (diff)
Merge remote-tracking branches 'asoc/topic/ssm2518', 'asoc/topic/sta529', 'asoc/topic/sti' and 'asoc/topic/sti-sas' into asoc-next