summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-07-03 16:51:26 +0100
committerMark Brown <broonie@kernel.org>2017-07-03 16:51:26 +0100
commit1233f6f531008fcd5c88774e7d86624365277b3d (patch)
treecd5f9c3a22fc198d2e257fa1738959255272fdc4 /sound
parentdea38fc5c3cf4b509737bd9a69e454871a448c02 (diff)
parent5894b91d1e700f38b4157df143be1502cf08daa8 (diff)
parenta6ff8ddcf3f38ec84337e5e7eb3e0e9a73754cf5 (diff)
parent17616ce62c84c94e9519574e9d2df6f20e80a285 (diff)
parent8e2d163b736e719ef850493ac7740a61d30b8f23 (diff)
parenta205c159f9e2db586a5ea475f4d22fa22e78fed8 (diff)
downloadlinux-1233f6f531008fcd5c88774e7d86624365277b3d.tar.bz2
Merge remote-tracking branches 'asoc/fix/rockchip', 'asoc/fix/rt5645', 'asoc/fix/rt5663', 'asoc/fix/rt5670' and 'asoc/fix/zte' into asoc-linus