From: Rob Clark <robdclark@chromium.org>
Date: Wed, 23 Jun 2021 14:32:59 +0000 (-0700)
Subject: Merge branch 'msm-fixes-v5.13-rc6' into msm-next-redo
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8c08c7b51ad33b75d480a20fb68a6f1376629e0e;p=linux.git

Merge branch 'msm-fixes-v5.13-rc6' into msm-next-redo

Syncing up with -rc6 fixes to avoid conflicts with a660 patches.

Signed-off-by: Rob Clark <robdclark@chromium.org>
---

8c08c7b51ad33b75d480a20fb68a6f1376629e0e