From: Mark Brown Date: Tue, 1 May 2018 21:12:18 +0000 (+0900) Subject: Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a X-Git-Tag: v4.18-rc1~127^2^2~156 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=783ec5e99ab9d8839957b15b5836e8bb795d74b6;p=linux.git Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a conflict between a fix and new development in mtk --- 783ec5e99ab9d8839957b15b5836e8bb795d74b6