Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y
authorDom Cobley <popcornmix@gmail.com>
Thu, 14 Oct 2021 12:26:02 +0000 (13:26 +0100)
committerDom Cobley <popcornmix@gmail.com>
Thu, 14 Oct 2021 12:26:02 +0000 (13:26 +0100)
1  2 
Makefile
drivers/gpu/drm/nouveau/dispnv50/head.c

diff --cc Makefile
Simple merge