summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-08-21 19:31:51 +0100
committerMark Brown <broonie@kernel.org>2017-08-21 19:31:51 +0100
commit702992387b759828f58e52f660acb284b3069944 (patch)
treeccfde4a2110b285d1a39a092c543d9e45b908117 /arch
parent8dbed90ad767268ee2d8aa25ec4814f878f1fba8 (diff)
parenta46f1cfaab29639289c82288ef84070f1acf8100 (diff)
parent3bb2991c1d4d487323fde7b5b63985798c91a03f (diff)
downloadlinux-702992387b759828f58e52f660acb284b3069944.tar.bz2
Merge branches 'topic/dmic' and 'topic/qcom' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-msm8916