summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 12:48:55 +0100
committerMark Brown <broonie@kernel.org>2014-10-06 12:48:55 +0100
commit9919badff1ae85ecb273491b9f8adff0bb47b0e7 (patch)
tree2f7f5266e06fa64752a2f5c4da01407ef4a2bd9d /sound/soc/codecs
parent1e9ca6857cee968f2af3a7be09418dfe27e81dce (diff)
parent98c5d36240e10c2e0e06e2bb10496291626d1d43 (diff)
parent5c216cc3f37a6eecb4e12ab0248b66e6386da0fe (diff)
parenta4f87cea72d78f80c0bda1b4d8a821278eb1e4e2 (diff)
parentcd9241e44af3d49977c39ddadbefbb719e2a4baf (diff)
Merge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs42l52', 'asoc/topic/cs42l56' and 'asoc/topic/da732x' into asoc-next