summaryrefslogtreecommitdiff
path: root/sound/soc/davinci
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 12:48:50 +0100
committerMark Brown <broonie@kernel.org>2014-10-06 12:48:50 +0100
commit832a94143c549bc750350c4e770f1f604e6aaffb (patch)
tree72904df357465a61714b0cc7391dac8b2997d586 /sound/soc/davinci
parentfd7aff54ff6862cde82db8a7d55166a2f0a34b9c (diff)
parent19926c6de0c37f486f00b7531aec4ba5a09451ae (diff)
parentf69e3caa9e1855737bf1e99e1fe4488e33d74bfe (diff)
Merge remote-tracking branches 'asoc/fix/davinci' and 'asoc/fix/max98090' into asoc-linus