From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 5 May 2021 22:49:06 +0000 (+1000)
Subject: Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cafa2254e3fa3eabd1609aabc76b9846297ef2f7;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'

# Conflicts:
#	drivers/gpu/drm/ttm/ttm_bo.c
---

cafa2254e3fa3eabd1609aabc76b9846297ef2f7