Merge remote-tracking branch 'drivers-x86/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 04:38:25 +0000 (14:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 04:38:25 +0000 (14:38 +1000)
# Conflicts:
# drivers/platform/surface/surface_aggregator_registry.c

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge