]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2576a5e 4ed39d3)
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 patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
Unnamed repository; edit this file 'description' to name the repository.