From: Stephen Rothwell Date: Wed, 14 Apr 2021 06:26:06 +0000 (+1000) Subject: Merge remote-tracking branch 'drivers-x86/for-next' X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fcc540ec891bf5e921de7ad8aa35b67252528e66;p=users%2Fjedix%2Flinux-maple.git Merge remote-tracking branch 'drivers-x86/for-next' # Conflicts: # MAINTAINERS # drivers/platform/x86/thinkpad_acpi.c --- fcc540ec891bf5e921de7ad8aa35b67252528e66 diff --cc MAINTAINERS index 68bd9fc85144,7dd6b67f0f51..2ce8a536956f --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -12042,14 -11872,14 +12053,22 @@@ F: drivers/scsi/smartpqi/smartpqi*.[ch F: include/linux/cciss*.h F: include/uapi/linux/cciss*.h +MICROSOFT SURFACE BATTERY AND AC DRIVERS +M: Maximilian Luz +L: linux-pm@vger.kernel.org +L: platform-driver-x86@vger.kernel.org +S: Maintained +F: drivers/power/supply/surface_battery.c +F: drivers/power/supply/surface_charger.c + + MICROSOFT SURFACE DTX DRIVER + M: Maximilian Luz + L: platform-driver-x86@vger.kernel.org + S: Maintained + F: Documentation/driver-api/surface_aggregator/clients/dtx.rst + F: drivers/platform/surface/surface_dtx.c + F: include/uapi/linux/surface_aggregator/dtx.h + MICROSOFT SURFACE GPE LID SUPPORT DRIVER M: Maximilian Luz L: platform-driver-x86@vger.kernel.org