summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-04-04 09:00:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-04-04 09:00:49 -0700
commit7ebd68d978bb784c284c60970a6e2d36e2434a6e (patch)
treeb2f83df1fd3c2a4b95a1bf475f5c7eea76b45f3b /MAINTAINERS
parentfffb5cd21e0b4ac4a5e26f7b356bbd97ed0cb5bb (diff)
parent566d3a52b8f618d22664171633d7106a630f46b9 (diff)
Merge tag 'platform-drivers-x86-v6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform driver fixes from Ilpo Järvinen: - thinkpad_acpi: - Fix NULL pointer dereferences while probing - Disable ACPI fan access for T495* and E560 - ISST: Correct command storage data length * tag 'platform-drivers-x86-v6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: MAINTAINERS: consistently use my dedicated email address platform/x86: ISST: Correct command storage data length platform/x86: thinkpad_acpi: disable ACPI fan access for T495* and E560 platform/x86: thinkpad_acpi: Fix NULL pointer dereferences while probing
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a7a1d121a83e..02d3c8795673 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5544,12 +5544,12 @@ F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
F: sound/soc/codecs/cros_ec_codec.*
CHROMEOS EC CHARGE CONTROL
-M: Thomas Weißschuh <thomas@weissschuh.net>
+M: Thomas Weißschuh <linux@weissschuh.net>
S: Maintained
F: drivers/power/supply/cros_charge-control.c
CHROMEOS EC HARDWARE MONITORING
-M: Thomas Weißschuh <thomas@weissschuh.net>
+M: Thomas Weißschuh <linux@weissschuh.net>
L: chrome-platform@lists.linux.dev
L: linux-hwmon@vger.kernel.org
S: Maintained
@@ -5557,7 +5557,7 @@ F: Documentation/hwmon/cros_ec_hwmon.rst
F: drivers/hwmon/cros_ec_hwmon.c
CHROMEOS EC LED DRIVER
-M: Thomas Weißschuh <thomas@weissschuh.net>
+M: Thomas Weißschuh <linux@weissschuh.net>
S: Maintained
F: drivers/leds/leds-cros_ec.c
@@ -10021,7 +10021,7 @@ F: Documentation/hwmon/gigabyte_waterforce.rst
F: drivers/hwmon/gigabyte_waterforce.c
GIGABYTE WMI DRIVER
-M: Thomas Weißschuh <thomas@weissschuh.net>
+M: Thomas Weißschuh <linux@weissschuh.net>
L: platform-driver-x86@vger.kernel.org
S: Maintained
F: drivers/platform/x86/gigabyte-wmi.c