| commit | 77af1f2b9a2464e4bce20cfd32bfb2390c67de7c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 26 13:55:46 2023 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 26 13:55:46 2023 -0700 |
| tree | c5d663393bd66e98ffa52e188145e8f7a2ae1973 | |
| parent | c551afcdc373eb66d12e08ed0434711c9a10ca2b [diff] | |
| parent | 5f7fdb0f255756b594cc45c2c08b0140bc4a1761 [diff] |
Merge tag 'thermal-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm Pull thermal control fix from Rafael Wysocki: "Fix a regression introduced inadvertently during the 6.3 cycle by a commit making the Intel int340x thermal driver use sysfs_emit_at() instead of scnprintf() (Srinivas Pandruvada)" * tag 'thermal-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: thermal: intel: int340x: Add new line for UUID display