From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Jan 2022 08:15:41 +0000 (+0200)
Subject: Merge tag 'thermal-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... 
X-Git-Tag: howlett/maple/20220722_2~1340
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6bdfb259d6d66161011d1d618af190f52b6d57fd;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'thermal-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull more thermal control updates from Rafael Wysocki:
 "Add device IDs for Raptor Lake to the int340x thermal control driver
  (Srinivas Pandruvada)"

* tag 'thermal-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: int340x: Add Raptor Lake PCI device id
  thermal: int340x: Support Raptor Lake
---

6bdfb259d6d66161011d1d618af190f52b6d57fd