summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-27 19:04:52 +0000
committerMark Brown <broonie@kernel.org>2014-11-27 19:04:52 +0000
commit9c9173d0637e21f561e1f5d05b20cf268ccfe84f (patch)
tree2523328f3dcf9a60979f8f58c2f4d915266439c2 /sound
parent164d9002589aac170676960279cbae2c8f128ed7 (diff)
parentd683d0b690c13437d752ccce47963ac64119b07a (diff)
parent2a4cfd10229dc93507aa5ddbc1ba0162140f4951 (diff)
parentcaaeb6a96f35af14f615838b924f54c9d0f33ab3 (diff)
parentd98123a76be53d570d72e04aac3e195a560ef149 (diff)
parent7195d920bd6094f6810e20a903027cd438bc6d8e (diff)
Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/sh', 'asoc/topic/sigmadsp' and 'asoc/topic/simple' into asoc-next