diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-23 09:47:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-23 09:47:43 -0700 |
| commit | 7586ac7c340c3672f116052c1d150f134810965b (patch) | |
| tree | 20a79f6e874ec2fad000e4092b31d6b88ea25dce /scripts/lib/kdoc/kdoc_output.py | |
| parent | Merge tag 'v6.15-rc8-ksmbd-server-fixes' of git://git.samba.org/ksmbd (diff) | |
| parent | thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature (diff) | |
| download | linux-rng-7586ac7c340c3672f116052c1d150f134810965b.tar.xz linux-rng-7586ac7c340c3672f116052c1d150f134810965b.zip | |
Merge tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fix from Rafael Wysocki:
"This fixes a coding mistake in the x86_pkg_temp_thermal Intel thermal
driver that was introduced by an incorrect conflict resolution during
a merge (Zhang Rui)"
* tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature
Diffstat (limited to 'scripts/lib/kdoc/kdoc_output.py')
0 files changed, 0 insertions, 0 deletions