summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-23 04:20:32 +0100
committerMark Brown <broonie@linaro.org>2014-02-23 04:20:32 +0100
commitd853c0ccb3d64eb0e87c7a03dc1e8f4b1ab001fa (patch)
treefc75e6351f6003a84ffee902a8985f06ce223714 /sound/soc
parentMerge remote-tracking branch 'asoc/fix/dapm' into asoc-linus (diff)
parentASoC: ad1980: Fix wrong number of items for capture source (diff)
parentASoC: isabelle: Fix the wrong number of items in enum ctls (diff)
downloadlinux-d853c0ccb3d64eb0e87c7a03dc1e8f4b1ab001fa.tar.xz
linux-d853c0ccb3d64eb0e87c7a03dc1e8f4b1ab001fa.zip
Merge remote-tracking branches 'asoc/fix/ad1980' and 'asoc/fix/isabelle' into asoc-linus