summaryrefslogtreecommitdiff
path: root/sound/soc/qcom
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 18:52:37 +0300
committerMark Brown <broonie@kernel.org>2016-12-12 18:52:37 +0300
commit1e570a83ad90f1e47540acd11cf1fac9da120815 (patch)
treea5d84f1f91480d0c1d209fb74fc46d7286c24dcd /sound/soc/qcom
parent2e8239e792ba9c86310e76e98017a11dc2173969 (diff)
parent86834511c2acd23e214d5739e9ea58e31b975d1f (diff)
parent3b89e4b77ef9c2f985964fab17032db98f074ed0 (diff)
downloadlinux-1e570a83ad90f1e47540acd11cf1fac9da120815.tar.xz
Merge remote-tracking branches 'asoc/fix/da7219-pops' and 'asoc/fix/qcom' into asoc-linus