diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-30 21:34:13 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-30 21:34:13 +0300 |
commit | 32665a9e5432fd88fe20f4affa8986833bbbabe7 (patch) | |
tree | c80bb6b37155344ef00665c7061f8531e39ce073 /arch/m68k | |
parent | 527953ef7125078cd43ccfbed042d60199842b31 (diff) | |
parent | 3c1d004bdb4e12b4b1dfbdd6a9167ea5003e48cd (diff) | |
download | linux-32665a9e5432fd88fe20f4affa8986833bbbabe7.tar.xz |
Merge tag 'thermal-5.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull additional thermal control update from Rafael Wysocki:
"Add Meteor Lake PCI device ID to the int340x thermal control driver
(Sumeet Pawnikar)"
* tag 'thermal-5.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: int340x: Add Meteor Lake PCI device ID
Diffstat (limited to 'arch/m68k')
0 files changed, 0 insertions, 0 deletions