]> www.infradead.org Git - users/hch/misc.git/commit
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platfo...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 07:45:39 +0000 (17:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 07:45:39 +0000 (17:45 +1000)
commit86866a99a9f1e8214239e88f7a717de69b850d09
treecade39da5d4e9a318af16a0c7e05f7198d79f194
parent1097618cd58f221c956a7f83dd8a0519b1c14530
parent3c415b1df95c06ae4f9bdb166541ab366b862cc2
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git

# Conflicts:
# drivers/platform/x86/asus-wmi.c
# drivers/platform/x86/dell/alienware-wmi-wmax.c
# drivers/platform/x86/intel/speed_select_if/isst_if_common.c
14 files changed:
Documentation/ABI/testing/sysfs-class-power
Documentation/hwmon/index.rst
MAINTAINERS
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/platform/x86/asus-wmi.c
drivers/platform/x86/dell/alienware-wmi-wmax.c
drivers/platform/x86/intel/pmc/core.c
drivers/platform/x86/intel/speed_select_if/isst_if_common.c
drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
drivers/platform/x86/thinkpad_acpi.c
drivers/power/supply/power_supply_sysfs.c
drivers/power/supply/test_power.c
include/linux/power_supply.h