From: Mark Brown Date: Thu, 18 Jan 2018 11:55:27 +0000 (+0000) Subject: Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus X-Git-Tag: v4.16-rc1~197^2~1^2~26 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=932505776779430053766113965c21cfb7ab823a;p=users%2Fwilly%2Flinux.git Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus --- 932505776779430053766113965c21cfb7ab823a