summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-09 15:10:12 +0800
committerMark Brown <broonie@kernel.org>2015-02-09 15:10:12 +0800
commitbd862e12bf677b9f8f5058a131548fdb7746e6a2 (patch)
tree7f4a43f87736d3ab961816260d1a272f5c4dc5e7 /sound/soc/codecs
parentdb5cdb3416dfe38527fc7c517b6f3ffecab24541 (diff)
parenta465122ae388c4951d1b39ed0186e82c1f5bcfb0 (diff)
parentd883641f87a42cffcdbbdc664fce1def20ed02b6 (diff)
parentb5fbcbab50b4f8065666d3633f47722bf8969b34 (diff)
parentcf0efa1c71c86b3ba731b9f3bad37ea4ceee6fbe (diff)
downloadkernel-bd862e12bf677b9f8f5058a131548fdb7746e6a2.tar.gz
Merge remote-tracking branches 'asoc/topic/bt-sco', 'asoc/topic/cs35l32', 'asoc/topic/cs42l52' and 'asoc/topic/cs42l56' into asoc-next