]> git.itanic.dy.fi Git - linux-stable/commit
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platfo...
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 07:54:26 +0000 (17:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 07:54:26 +0000 (17:54 +1000)
commit76dddd405eec891fe2578166335e4fa862318ed6
treeea0b479c1350cd4165f089180b6d1c4adf07aa0c
parent0014dfe3c4c7aae5d28dae5964d7bfc04f183e92
parent88c0ef69dd881d8acceb62c48b66674367c962b7
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git

# Conflicts:
# MAINTAINERS
MAINTAINERS
drivers/platform/x86/intel/vbtn.c
drivers/platform/x86/toshiba_acpi.c
drivers/platform/x86/uv_sysfs.c