From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jun 2021 04:38:25 +0000 (+1000)
Subject: Merge remote-tracking branch 'drivers-x86/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1ec21843e8e9951cedb53ccccf8edbf60ec3b08d;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'drivers-x86/for-next'

# Conflicts:
#	drivers/platform/surface/surface_aggregator_registry.c
---

1ec21843e8e9951cedb53ccccf8edbf60ec3b08d