From: Mark Brown Date: Mon, 10 Sep 2018 17:55:12 +0000 (+0100) Subject: Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict X-Git-Tag: v5.4-rc1~2066^2~18^2~127 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54a3da1c105ca91c4d32f25c3d9c57a61e9a3467;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict --- 54a3da1c105ca91c4d32f25c3d9c57a61e9a3467