summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 12:12:13 +0100
committerMark Brown <broonie@kernel.org>2017-09-01 12:12:13 +0100
commita5ef8ca69a6bea61062854ee37cb199a5659964c (patch)
tree48659ab659532294eda439adc14e805f4d128a09 /sound/soc
parent1a34ec4ab2851e2d0a02e2a63b6296e686512a7e (diff)
parent4428ffa1fe66a9e3cf68bba3ad135f17be4ed674 (diff)
parent8d7313bfb1bb7d71a6ebc503215e4fb4a8964741 (diff)
Merge remote-tracking branches 'asoc/fix/arizona' and 'asoc/fix/mtk' into asoc-linus