From: Mark Brown <broonie@kernel.org>
Date: Fri, 26 Jul 2019 12:10:09 +0000 (+0100)
Subject: Merge branch 'asoc-5.3' into asoc-5.4
X-Git-Tag: v5.4-rc1~52^2~1^2~309
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3b46a67af2eb8214a634a37c485146ca0ef42849;p=users%2Fwilly%2Flinux.git

Merge branch 'asoc-5.3' into asoc-5.4
---

3b46a67af2eb8214a634a37c485146ca0ef42849
diff --cc sound/soc/codecs/rt1308.c
index 6f2ee6809dbb,d673506c7c39..6f2ee6809dbb
mode 100755,100644..100644
--- a/sound/soc/codecs/rt1308.c
+++ b/sound/soc/codecs/rt1308.c
diff --cc sound/soc/codecs/rt1308.h
index ff7c423e879e,c330aae1d527..ff7c423e879e
mode 100755,100644..100644
--- a/sound/soc/codecs/rt1308.h
+++ b/sound/soc/codecs/rt1308.h