summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-23 12:20:32 +0900
committerMark Brown <broonie@linaro.org>2014-02-23 12:20:32 +0900
commitd853c0ccb3d64eb0e87c7a03dc1e8f4b1ab001fa (patch)
treefc75e6351f6003a84ffee902a8985f06ce223714 /sound
parent45d39cbf00f7093929dd336967854ffac8ed8826 (diff)
parent901bb6c55d2a7ef66bc0bdf0ba410c417f16b7cf (diff)
parentcdbb492557112bddad26f0ba4ba9ba87d919ebfc (diff)
Merge remote-tracking branches 'asoc/fix/ad1980' and 'asoc/fix/isabelle' into asoc-linus